Skip to content

Commit

Permalink
Merge pull request #18 from nickpaa/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@nickpaa
nickpaa authored Oct 3, 2020
2 parents 0c1a0bc + 105a836 commit 6e85229
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion statplots/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'fonts.gstatic.com',
'cdnjs.cloudflare.com'
],
'img-src': '\'self\''
'img-src': '\'self\' data:'
}
talisman = Talisman(app, content_security_policy=csp)

Expand Down
26 changes: 13 additions & 13 deletions statplots/static/compare.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,43 +742,43 @@ function displayXlFormula(d) {
rButton.classList.remove('btn-selected');
xlButton.classList.add('btn-selected');
document.getElementById('syntax').textContent = "Excel";
document.getElementById('pctDescription').textContent = 'Percentile (evaluated at alpha)'
document.getElementById('pctDescription').textContent = 'Percentile (evaluated at p)'
document.getElementById('rvDescription').textContent = 'Draw one random variable';

if (d.whichDist === 'beta') {
let alpha = -d.mean * (d.mean * d.mean - d.mean + d._var) / d._var;
let beta = (d.mean - 1) * (d.mean * d.mean - d.mean + d._var) / d._var;
let alpha = -d.mean * (d.mean ** 2 - d.mean + d._var) / d._var;
let beta = (d.mean - 1) * (d.mean ** 2 - d.mean + d._var) / d._var;
d.pdfFormula.textContent = "beta.dist(x, " + alpha + ", " + beta + ", false)";
d.cdfFormula.textContent = "beta.dist(x, " + alpha + ", " + beta + ", true)";
d.pctFormula.textContent = "beta.inv(" + alpha + ", " + beta + ", alpha)";
d.rvFormula.textContent = "";
d.rvFormula.textContent = `beta.inv(p, ${alpha}, ${beta})`;
d.rvFormula.textContent = `beta.inv(rand(), ${alpha}, ${beta})`;
}
else if (d.whichDist === 'binomial') {
let trials = d.mean * d.mean / (d.mean - d._var);
let probability_s = (1 - (d._var / d.mean));
d.pdfFormula.textContent = "binom.dist(x, " + trials + ", " + probability_s + ", false)";
d.cdfFormula.textContent = "binom.dist(x, " + trials + ", " + probability_s + ", true)";
d.pctFormula.textContent = "binom.inv(" + trials + ", " + probability_s + ", alpha)";
d.rvFormula.textContent = "";
d.pctFormula.textContent = `binom.inv(${trials}, ${probability_s}, p`;
d.rvFormula.textContent = `binom.inv(${trials}, ${probability_s}, rand())`;
}
else if (d.whichDist === 'exponential') {
let lambda = 1 / d.mean;
d.pdfFormula.textContent = "expon.dist(x, " + lambda + ", false)";
d.cdfFormula.textContent = "expon.dist(x, " + lambda + ", true)";
d.pctFormula.textContent = "";
d.rvFormula.textContent = "";
d.pctFormula.textContent = `-ln(1 - p) / ${lambda}`;
d.rvFormula.textContent = `-ln(1 - rand()) / ${lambda}`;
}
else if (d.whichDist === 'normal') {
d.pdfFormula.textContent = "norm.dist(x, " + d.mean + ", " + d.sd + ", false)";
d.cdfFormula.textContent = "norm.dist(x, " + d.mean + ", " + d.sd + ", true)";
d.pctFormula.textContent = "norm.inv(" + d.mean + ", " + d.sd + ", alpha)";
d.rvFormula.textContent = `${d.mean}+${d.sd}*norm.s.inv(rand())`;
d.pctFormula.textContent = `norm.inv(${d.mean}, ${d.sd}, p)`
d.rvFormula.textContent = `norm.inv(${d.mean}, ${d.sd}, rand())`
}
else if (d.whichDist === 'poisson') {
d.pdfFormula.textContent = "poisson.dist(x, " + d.mean + ", false)";
d.cdfFormula.textContent = "poisson.dist(x, " + d.mean + ", true)";
d.pctFormula.textContent = "poisson.inv(" + d.mean + ", alpha)";
d.rvFormula.textContent = "";
d.pctFormula.textContent = "poisson.inv(" + d.mean + ", p)";
d.rvFormula.textContent = `poisson.inv(${d.mean}, rand())`;
}

else {
Expand Down
26 changes: 13 additions & 13 deletions statplots/static/single.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,43 +669,43 @@ function displayXlFormula(d) {
rButton.classList.remove('btn-selected');
xlButton.classList.add('btn-selected');
document.getElementById('syntax').textContent = "Excel";
document.getElementById('pctDescription').textContent = 'Percentile (evaluated at alpha)'
document.getElementById('pctDescription').textContent = 'Percentile (evaluated at p)'
document.getElementById('rvDescription').textContent = 'Draw one random variable';

if (d.whichDist === 'beta') {
let alpha = -d.mean * (d.mean * d.mean - d.mean + d._var) / d._var;
let beta = (d.mean - 1) * (d.mean * d.mean - d.mean + d._var) / d._var;
let alpha = -d.mean * (d.mean ** 2 - d.mean + d._var) / d._var;
let beta = (d.mean - 1) * (d.mean ** 2 - d.mean + d._var) / d._var;
d.pdfFormula.textContent = "beta.dist(x, " + alpha + ", " + beta + ", false)";
d.cdfFormula.textContent = "beta.dist(x, " + alpha + ", " + beta + ", true)";
d.pctFormula.textContent = "beta.inv(" + alpha + ", " + beta + ", alpha)";
d.rvFormula.textContent = "";
d.rvFormula.textContent = `beta.inv(p, ${alpha}, ${beta})`;
d.rvFormula.textContent = `beta.inv(rand(), ${alpha}, ${beta})`;
}
else if (d.whichDist === 'binomial') {
let trials = d.mean * d.mean / (d.mean - d._var);
let probability_s = (1 - (d._var / d.mean));
d.pdfFormula.textContent = "binom.dist(x, " + trials + ", " + probability_s + ", false)";
d.cdfFormula.textContent = "binom.dist(x, " + trials + ", " + probability_s + ", true)";
d.pctFormula.textContent = "binom.inv(" + trials + ", " + probability_s + ", alpha)";
d.rvFormula.textContent = "";
d.pctFormula.textContent = `binom.inv(${trials}, ${probability_s}, p`;
d.rvFormula.textContent = `binom.inv(${trials}, ${probability_s}, rand())`;
}
else if (d.whichDist === 'exponential') {
let lambda = 1 / d.mean;
d.pdfFormula.textContent = "expon.dist(x, " + lambda + ", false)";
d.cdfFormula.textContent = "expon.dist(x, " + lambda + ", true)";
d.pctFormula.textContent = "";
d.rvFormula.textContent = "";
d.pctFormula.textContent = `-ln(1 - p) / ${lambda}`;
d.rvFormula.textContent = `-ln(1 - rand()) / ${lambda}`;
}
else if (d.whichDist === 'normal') {
d.pdfFormula.textContent = "norm.dist(x, " + d.mean + ", " + d.sd + ", false)";
d.cdfFormula.textContent = "norm.dist(x, " + d.mean + ", " + d.sd + ", true)";
d.pctFormula.textContent = "norm.inv(" + d.mean + ", " + d.sd + ", alpha)";
d.rvFormula.textContent = `${d.mean}+${d.sd}*norm.s.inv(rand())`;
d.pctFormula.textContent = `norm.inv(${d.mean}, ${d.sd}, p)`
d.rvFormula.textContent = `norm.inv(${d.mean}, ${d.sd}, rand())`
}
else if (d.whichDist === 'poisson') {
d.pdfFormula.textContent = "poisson.dist(x, " + d.mean + ", false)";
d.cdfFormula.textContent = "poisson.dist(x, " + d.mean + ", true)";
d.pctFormula.textContent = "poisson.inv(" + d.mean + ", alpha)";
d.rvFormula.textContent = "";
d.pctFormula.textContent = "poisson.inv(" + d.mean + ", p)";
d.rvFormula.textContent = `poisson.inv(${d.mean}, rand())`;
}

else {
Expand Down
36 changes: 18 additions & 18 deletions statplots/templates/compare.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<div class="form-group">
<label for="distField">Distribution 1</label>
<select id="distField" class="form-control">
<option value="beta">Beta</option>
<option value="binomial">Binomial</option>
<option value="exponential">Exponential</option>
<option value="folded normal">Folded normal</option>
<option value="gamma">Gamma</option>
<option value="negative binomial">Negative binomial</option>
<option value="normal" selected>Normal</option>
<option value="poisson">Poisson</option>
<option value="truncated normal">Truncated normal</option>
<option value="beta">beta</option>
<option value="binomial">binomial</option>
<option value="exponential">exponential</option>
<option value="folded normal">folded normal</option>
<option value="gamma">gamma</option>
<option value="negative binomial">negative binomial</option>
<option value="normal" selected>normal</option>
<option value="poisson">poisson</option>
<option value="truncated normal">truncated normal</option>
</select>
<small id="distHint"></small>
</div>
Expand Down Expand Up @@ -65,15 +65,15 @@
<div class="form-group">
<label for="distField">Distribution 2</label>
<select id="distField2" class="form-control">
<option value="beta">Beta</option>
<option value="binomial">Binomial</option>
<option value="exponential">Exponential</option>
<option value="folded normal">Folded normal</option>
<option value="gamma">Gamma</option>
<option value="negative binomial">Negative binomial</option>
<option value="normal" selected>Normal</option>
<option value="poisson">Poisson</option>
<option value="truncated normal">Truncated normal</option>
<option value="beta">beta</option>
<option value="binomial">binomial</option>
<option value="exponential">exponential</option>
<option value="folded normal">folded normal</option>
<option value="gamma">gamma</option>
<option value="negative binomial">negative binomial</option>
<option value="normal" selected>normal</option>
<option value="poisson">poisson</option>
<option value="truncated normal">truncated normal</option>
</select>
<small id="distHint2"></small>
</div>
Expand Down
18 changes: 9 additions & 9 deletions statplots/templates/single.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
<div class="form-group">
<label for="distField">Distribution 1</label>
<select id="distField" class="form-control">
<option value="beta">Beta</option>
<option value="binomial">Binomial</option>
<option value="exponential">Exponential</option>
<option value="folded normal">Folded normal</option>
<option value="gamma">Gamma</option>
<option value="negative binomial">Negative binomial</option>
<option value="normal" selected>Normal</option>
<option value="poisson">Poisson</option>
<option value="truncated normal">Truncated normal</option>
<option value="beta">beta</option>
<option value="binomial">binomial</option>
<option value="exponential">exponential</option>
<option value="folded normal">folded normal</option>
<option value="gamma">gamma</option>
<option value="negative binomial">negative binomial</option>
<option value="normal" selected>normal</option>
<option value="poisson">poisson</option>
<option value="truncated normal">truncated normal</option>
</select>
<small id="distHint"></small>
</div>
Expand Down

0 comments on commit 6e85229

Please sign in to comment.