This guide is
diff --git a/js/blerp.js b/js/blerp.js
index c1eada7..ba3a90c 100644
--- a/js/blerp.js
+++ b/js/blerp.js
@@ -1,6 +1,9 @@
window.$ = (query,el=document)=>{
return el.querySelector(query);
};
+window.$all = (query,el=document)=>{
+ return [...el.querySelectorAll(query)];
+};
{
@@ -8,11 +11,13 @@ window.$ = (query,el=document)=>{
title = encodeURIComponent($('#share_title').innerText.trim()),
desc = encodeURIComponent($('#share_desc').innerText.trim());
- $('#shareables').innerHTML = `
- 
- 
- 
- `;
+ $all('.shareables').forEach((dom)=>{
+ dom.innerHTML = `
+
+
+
+ `;
+ });
}
@@ -22,4 +27,8 @@ $('#show_feetnotes_button').onclick = ()=>{
$('#show_feetnotes_button').style.display = 'none';
$('#shown_feetnotes').style.display = 'block';
$('.footnotes').style.display = 'block';
-};
\ No newline at end of file
+};
+
+$all('.footnotes a[rev="footnote"]').forEach((a)=>{
+ a.setAttribute('target','_self');
+});
\ No newline at end of file
diff --git a/pics/mitigation_vs_suppression.png b/pics/mitigation_vs_suppression.png
new file mode 100644
index 0000000..0989973
Binary files /dev/null and b/pics/mitigation_vs_suppression.png differ
diff --git a/sharing/shareables.png b/sharing/shareables.png
new file mode 100644
index 0000000..0b8d218
Binary files /dev/null and b/sharing/shareables.png differ
diff --git a/sim/index.html b/sim/index.html
index d7740f9..c22dd2c 100644
--- a/sim/index.html
+++ b/sim/index.html
@@ -36,7 +36,7 @@
- Becomes
@@ -140,15 +140,28 @@
-
diff --git a/sim/js/Controls.js b/sim/js/Controls.js
index 0c623a4..6490095 100644
--- a/sim/js/Controls.js
+++ b/sim/js/Controls.js
@@ -114,9 +114,11 @@ $all('.sim_input').forEach((slider)=>{
}
// MORE HAX
+ /*
if(daysCurrent==0){
sbDOM.setAttribute('label','params');
}
+ */
// HAX
INPUTS_WERE_CHANGED = true;
@@ -189,7 +191,7 @@ let restart = ()=>{
/////////////////////////////////////
let bbDOM = $('.big_button');
-let sbDOM = $('.small_button');
+//let sbDOM = $('.small_button');
let handTutorial = 0;
@@ -266,6 +268,27 @@ let defaultParams = [
["p_summer", 0],
];
+let _resetAll = ()=>{
+ changeSliders(defaultParams);
+ changeSliders(CURRENT_STAGE.inputs);
+ _resetTheSim();
+};
+$('#sb_reset').onclick = ()=>{
+ _resetAll();
+ _updateButtons();
+};
+
+$('#sb_replay').onclick = ()=>{
+ _resetAll();
+ recordedHistory = JSON.parse(JSON.stringify(CURRENT_STAGE.PLAY_RECORDING));
+ _updateButtons();
+
+ restart();
+ IS_PLAYING = true;
+};
+
+
+/*
sbDOM.onclick = ()=>{
if(daysCurrent==0){
@@ -279,27 +302,32 @@ sbDOM.onclick = ()=>{
}
_updateButtons();
};
+*/
let _updateButtons = ()=>{
if(daysCurrent > daysTotal){
bbDOM.setAttribute('label','reset');
- sbDOM.setAttribute('label','');
+ //sbDOM.setAttribute('label','');
}else if(IS_PLAYING){
bbDOM.setAttribute('label','pause');
- sbDOM.setAttribute('label','reset');
+ $('#sb_reset').style.display = 'block';
+ if(CURRENT_STAGE.PLAY_RECORDING){
+ $('#sb_replay').style.display = 'block';
+ }
+ //sbDOM.setAttribute('label','reset');
}else{
if(daysCurrent==0){
bbDOM.setAttribute('label','start');
- sbDOM.setAttribute('label','NONE');
+ //sbDOM.setAttribute('label','NONE');
}else{
bbDOM.setAttribute('label','continue');
- sbDOM.setAttribute('label','reset');
+ //sbDOM.setAttribute('label','reset');
}
}
@@ -333,7 +361,7 @@ let _hideAllControls = ()=>{
let _resetTheSim = ()=>{
_showAllControls();
//IS_REPLAYING_HISTORY = false;
- //recordedHistory = [];
+ recordedHistory = [];
restart();
IS_PLAYING = false;
};
diff --git a/sim/js/Model.js b/sim/js/Model.js
index 10b78f5..45f2f40 100644
--- a/sim/js/Model.js
+++ b/sim/js/Model.js
@@ -438,7 +438,7 @@ let draw = ()=>{
params._HACK_RESET_WHEN_I_100 = "go";
bbDOM.setAttribute('label','reset');
- sbDOM.setAttribute('label','');
+ //sbDOM.setAttribute('label','');
if(CURRENT_STAGE.SHOW_HAND=="tutorial_0" && handTutorial==1){
if(!HAND_IS_VISIBLE){
diff --git a/sim/sim.css b/sim/sim.css
index 4e0a75a..96abe15 100644
--- a/sim/sim.css
+++ b/sim/sim.css
@@ -4,6 +4,7 @@ body{
font-size: 15px;
font-weight: normal;
background: #ddd;
+ line-height: 15px;
}
div{
-webkit-user-select: none; /* Chrome all / Safari all */
@@ -48,8 +49,8 @@ div{
}
#sim_controls{
- margin-top: 10px;
width: 250px;
+ position: relative;
}
.big_button{
@@ -67,6 +68,8 @@ div{
}
.big_button > div{
display: none;
+ position: relative;
+ top: -6px;
}
.big_button[label='start'] > #bb_start{
display: block;
@@ -87,28 +90,22 @@ div{
.big_button[label='reset'] > #bb_reset{
display: block;
}
-.small_button{
- text-align: right;
- margin-top: 3px;
+
+#sb_reset, #sb_replay{
+ position: absolute;
color: #999;
- font-size: 17px;
+ font-size: 15px;
font-weight: 100;
cursor: pointer;
+ bottom: -22px;
+
+ display: none;
}
-.small_button:hover{
- color: #aaa;
+#sb_reset:hover, #sb_replay:hover{
+ color: #bbb;
}
-.small_button > div{
- display: none;
-}
-.small_button[label='reset'] > #sb_reset{
- display: block;
-}
-.small_button[label='replay'] > #sb_replay{
- display: block;
-}
-.small_button[label='params'] > #sb_params{
- display: block;
+#sb_reset{
+ right: 0px;
}
hr{
@@ -294,6 +291,7 @@ icon[r]{
position: absolute;
font-size: 20px;
width: 250px;
+ line-height: 1.3em;
}
@keyframes aniFrames{
@@ -306,4 +304,25 @@ icon[r]{
100% {
transform: translate(0px,0px);
}
-}
\ No newline at end of file
+}
+
+
+.control_icon{
+ width:36px;
+ height:36px;
+ background: url(../icons/controls.png);
+ background-size: auto 100%;
+ display: inline-block;
+
+ position: relative;
+ top: 6px;
+}
+.control_icon[continue]{
+ background-position: -100% 0;
+}
+.control_icon[pause]{
+ background-position: -200% 0;
+}
+.control_icon[reset]{
+ background-position: -300% 0;
+}
diff --git a/words/words.md b/words/words.md
index e954368..cab350f 100644
--- a/words/words.md
+++ b/words/words.md
@@ -2,8 +2,8 @@
@@ -257,9 +257,7 @@ Even if only 0.5% of infected die â a generous assumption when there's no more
The "Flatten The Curve" plan was touted by every public health organization, while the United Kingdom's original "herd immunity" plan was universally booed. They were *the same plan.* The UK just communicated theirs poorly.[^yong]
-[^yong]: â[Graham Medley] says that the actual goal is the same as that of other countries: flatten the curve by staggering the onset of infections. As a consequence, the nation may achieve herd immunity; itâs a side effect, not an aim. [...]
-
- The governmentâs actual coronavirus action plan, available online, doesnât mention herd immunity at all. [...] âItâs been a case of how not to communicate during an outbreak,â says Devi Sridhar, a public-health specialist at the University of Edinburgh.â
+[^yong]: âHe says that the actual goal is the same as that of other countries: flatten the curve by staggering the onset of infections. As a consequence, the nation may achieve herd immunity; itâs a side effect, not an aim. [...] The governmentâs actual coronavirus action plan, available online, doesnât mention herd immunity at all.â
From a [The Atlantic article by Ed Yong](https://www.theatlantic.com/health/archive/2020/03/coronavirus-pandemic-herd-immunity-uk-boris-johnson/608065/)
@@ -297,7 +295,7 @@ Three notes:
That was the other finding of the March 16 Imperial College report, which convinced the UK to abandon its original plan. Any attempt at **mitigation** (reduce R, but R > 1) will fail. The only way out is **suppression** (reduce R so that R < 1).
-// TODO: pic difference
+
That is, don't merely "flatten" the curve, *crush* the curve. For example, with a...
@@ -319,7 +317,7 @@ So, what, do we just lockdown again & again?
###Scenario 3: Intermittent Lockdown
-This solution was first suggested by the March 16 Imperial College report, and later again by a Harvard paper[^lockdown_harvard].
+This solution was first suggested by the March 16 Imperial College report, and later again by a Harvard paper.[^lockdown_harvard]
[^lockdown_harvard]: âAbsent other interventions, a key metric for the success of social distancing is whether critical care capacities are exceeded. To avoid this, prolonged or intermittent social distancing may be necessary into 2022.â [Kissler and Tedijanto et al](https://science.sciencemag.org/content/early/2020/04/14/science.abb5793)
@@ -585,7 +583,7 @@ But for COVID-19 *in humans*, as of May 1st 2020, "how long" is the big unknown.
[^monkeys]: From [Bao et al.](https://www.biorxiv.org/content/10.1101/2020.03.13.990226v1.abstract) *Disclaimer: This article is a preprint and has not been certified by peer review (yet).* Also, to emphasize: they only tested re-infection 28 days later.
For these simulations, let's say it's 1 year.
-**Here's a simulation starting with 100%