From fbbbff2f690276d85e50e05c6df4c68d8c1774fb Mon Sep 17 00:00:00 2001
From: Joel Chan <chozen86@gmail.com>
Date: Sun, 11 Feb 2024 22:31:20 -0500
Subject: [PATCH] update conditionals

---
 4_Conditionals.html | 141 ++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 97 deletions(-)

diff --git a/4_Conditionals.html b/4_Conditionals.html
index d913855..bb1702f 100644
--- a/4_Conditionals.html
+++ b/4_Conditionals.html
@@ -688,14 +688,13 @@ <h2>What are conditionals and why do we care about them?<a class="headerlink" hr
 <p>A set of pictures might help to give the intuition:</p>
 <a class="bg-primary mb-1 reference internal image-reference" href="_images/conditional-pictures.png"><img alt="_images/conditional-pictures.png" class="bg-primary mb-1 align-center" src="_images/conditional-pictures.png" style="width: 1000px;" /></a>
 <p>Basically anytime you find yourself at a problem step or part of your problem where you say something like “<code class="docutils literal notranslate"><span class="pre">do</span> <span class="pre">something</span></code> <em>based on / depending on / looking at / if</em> <code class="docutils literal notranslate"><span class="pre">some</span> <span class="pre">condition</span></code>”, that is a signal that you need a conditional.</p>
-<p>Let’s brainstorm some real-world examples together!</p>
+<p>Here are some examples:</p>
 <ul class="simple">
 <li><p>decide what to wear: check temperature, check if i’m going to a dress code location</p></li>
 <li><p>shopping: check how much money i have, check quality level of the thing, what i need; decide what to buy</p></li>
 <li><p>decide what to eat: spiciness, taste, price</p></li>
-<li><p>decide what section of a class to take</p></li>
-<li></li>
 </ul>
+<p>What are some other real-world examples of this sort of situation that you can think of?</p>
 </section>
 <section id="anatomy-of-a-basic-conditional-block-in-python">
 <h2>Anatomy of a basic conditional block in Python<a class="headerlink" href="#anatomy-of-a-basic-conditional-block-in-python" title="Permalink to this headline">#</a></h2>
@@ -803,7 +802,7 @@ <h2>A closer look at Boolean expressions<a class="headerlink" href="#a-closer-lo
 <p>All conditional blocks depend on well-crafted <strong>Boolean Expressions</strong>, which are expressions that evaluate to a Boolean value (i.e., True or False). This is what really determines the logic of the control of flow. So you need to make sure you’re proficient with Booolean expressions.</p>
 <section id="boolean-operators">
 <h3>Boolean Operators<a class="headerlink" href="#boolean-operators" title="Permalink to this headline">#</a></h3>
-<p>We use <strong>Boolean</strong> Operators to compare TWO pieces of data. When evaluated, they yield a Boolean value (True or False).</p>
+<p>We use <strong>Boolean</strong> Operators to compare TWO pieces of data. When evaluated, they yield a Boolean value (<code class="docutils literal notranslate"><span class="pre">True</span></code> or <code class="docutils literal notranslate"><span class="pre">False</span></code>).</p>
 <p><code class="docutils literal notranslate"><span class="pre">data1</span> <span class="pre">booleanOperator</span> <span class="pre">data2</span></code></p>
 <p>Here are the main ones:</p>
 <ul class="simple">
@@ -817,7 +816,7 @@ <h3>Boolean Operators<a class="headerlink" href="#boolean-operators" title="Perm
 </section>
 <section id="logical-operators">
 <h3>Logical operators<a class="headerlink" href="#logical-operators" title="Permalink to this headline">#</a></h3>
-<p>We use <strong>Logical</strong> operators to combine basic Boolean expressions into more complex ones, like “is a more than 3 and less than 5”</p>
+<p>We use <strong>Logical</strong> operators to <em>combine</em> basic Boolean expressions into more complex ones, like “is <code class="docutils literal notranslate"><span class="pre">a</span></code> more than 3 <em>and</em> less than 5”</p>
 <p>Here are the main ones:</p>
 <ul class="simple">
 <li><p><code class="docutils literal notranslate"><span class="pre">and</span></code> (True if <em>all</em> Boolean expressions are True)</p></li>
@@ -829,7 +828,7 @@ <h3>Logical operators<a class="headerlink" href="#logical-operators" title="Perm
 </section>
 <section id="practice-construct-boolean-expressions">
 <h2>Practice: Construct Boolean expressions<a class="headerlink" href="#practice-construct-boolean-expressions" title="Permalink to this headline">#</a></h2>
-<p>Let’s practice! Translate these Boolean expressions with me from English into Python.</p>
+<p>Let’s practice! Translate these Boolean expressions from English into Python.</p>
 <section id="basic-boolean-expressions-only-boolean-operator">
 <h3>Basic Boolean expressions (only Boolean operator)<a class="headerlink" href="#basic-boolean-expressions-only-boolean-operator" title="Permalink to this headline">#</a></h3>
 <div class="cell docutils container">
@@ -837,12 +836,7 @@ <h3>Basic Boolean expressions (only Boolean operator)<a class="headerlink" href=
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># is the driver&#39;s speed above the limit?</span>
 <span class="n">speed</span> <span class="o">=</span> <span class="mi">75</span>
 <span class="n">limit</span> <span class="o">=</span> <span class="mi">45</span>
-<span class="n">speed</span> <span class="o">&gt;</span> <span class="n">limit</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>True
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -851,12 +845,7 @@ <h3>Basic Boolean expressions (only Boolean operator)<a class="headerlink" href=
 <div class="cell_input docutils container">
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># do i have a passport?</span>
 <span class="n">hasPassport</span> <span class="o">=</span> <span class="kc">True</span> <span class="c1"># assign the value True to the passport variable</span>
-<span class="n">hasPassport</span> <span class="o">==</span> <span class="kc">True</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>True
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -870,12 +859,7 @@ <h3>Compound Boolean expressions (Boolean operators + Logical operators)<a class
 <span class="c1"># which is operationalized as &quot;do i have enough credits, with enough GPA?&quot;</span>
 <span class="n">num_credits</span> <span class="o">=</span> <span class="mi">120</span> <span class="c1"># threshold of 120</span>
 <span class="n">GPA</span> <span class="o">=</span> <span class="mf">1.5</span> <span class="c1"># threshold of 2.0</span>
-<span class="n">num_credits</span> <span class="o">&gt;=</span> <span class="mi">120</span> <span class="ow">and</span> <span class="n">GPA</span> <span class="o">&gt;=</span> <span class="mf">2.5</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>False
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -885,12 +869,7 @@ <h3>Compound Boolean expressions (Boolean operators + Logical operators)<a class
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># did i take the prereq for the class OR get permissionm from the instructor?</span>
 <span class="n">took_prereq</span> <span class="o">=</span> <span class="kc">False</span>
 <span class="n">have_permission</span> <span class="o">=</span> <span class="kc">True</span>
-<span class="n">took_prereq</span> <span class="ow">or</span> <span class="n">have_permission</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>True
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -899,12 +878,7 @@ <h3>Compound Boolean expressions (Boolean operators + Logical operators)<a class
 <div class="cell_input docutils container">
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># is the driver not wearing a seat belt?</span>
 <span class="n">seatBelt</span> <span class="o">=</span> <span class="kc">False</span>
-<span class="ow">not</span> <span class="n">seatBelt</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>True
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -916,12 +890,7 @@ <h3>Compound Boolean expressions (Boolean operators + Logical operators)<a class
 <span class="n">door_angle</span> <span class="o">=</span> <span class="mi">5</span>
 <span class="n">sign_says</span> <span class="o">=</span> <span class="s2">&quot;Come in&quot;</span>
 <span class="n">haveAppointment</span> <span class="o">=</span> <span class="kc">True</span>
-<span class="n">prof_in_office</span> <span class="ow">and</span> <span class="n">door_angle</span> <span class="o">&gt;=</span> <span class="mi">15</span> <span class="ow">or</span> <span class="n">sign_says</span> <span class="o">==</span> <span class="s2">&quot;Come in&quot;</span> <span class="ow">or</span> <span class="n">haveAppointment</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output text_plain highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>True
+<span class="c1"># boolean expression here</span>
 </pre></div>
 </div>
 </div>
@@ -937,15 +906,7 @@ <h2>Practice: construct basic conditional blocks<a class="headerlink" href="#pra
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># if my speed is above the limit, print stop; otherwise, let me pass</span>
 <span class="n">speed</span> <span class="o">=</span> <span class="mi">25</span>
 <span class="n">limit</span> <span class="o">=</span> <span class="mi">45</span>
-<span class="k">if</span> <span class="n">speed</span> <span class="o">&gt;</span> <span class="n">limit</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Stop&quot;</span><span class="p">)</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Go ahead&quot;</span><span class="p">)</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>Go ahead
+<span class="c1"># conditional block below here</span>
 </pre></div>
 </div>
 </div>
@@ -956,15 +917,7 @@ <h2>Practice: construct basic conditional blocks<a class="headerlink" href="#pra
 <div class="highlight-ipython3 notranslate"><div class="highlight"><pre><span></span><span class="c1"># if i have a passport, print come on in; otherwise, print go away</span>
 <span class="c1"># do i have a passport?</span>
 <span class="n">hasPassport</span> <span class="o">=</span> <span class="kc">False</span> <span class="c1"># assign the value True to the passport variable</span>
-<span class="k">if</span> <span class="n">hasPassport</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Come on in&quot;</span><span class="p">)</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Go away&quot;</span><span class="p">)</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>Go away
+<span class="c1"># conditional block below here</span>
 </pre></div>
 </div>
 </div>
@@ -977,18 +930,7 @@ <h2>Practice: construct basic conditional blocks<a class="headerlink" href="#pra
 <span class="c1"># did i take the prereq for the class OR get permissionm from the instructor?</span>
 <span class="n">num_credits</span> <span class="o">=</span> <span class="mi">110</span> <span class="c1"># threshold of 120</span>
 <span class="n">GPA</span> <span class="o">=</span> <span class="mf">1.9</span> <span class="c1"># threshold of 2.0</span>
-<span class="k">if</span> <span class="n">num_credits</span> <span class="o">&gt;=</span> <span class="mi">120</span> <span class="ow">and</span> <span class="n">GPA</span> <span class="o">&gt;=</span> <span class="mf">2.5</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Graduate&quot;</span><span class="p">)}</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Don&#39;t graduate&quot;</span><span class="p">)</span>
-</pre></div>
-</div>
-</div>
-<div class="cell_output docutils container">
-<div class="output traceback highlight-ipythontb notranslate"><div class="highlight"><pre><span></span><span class="gt">  File</span><span class="nn"> &quot;/var/folders/xz/_hjc5hsx743dclmg8n5678nc0000gn/T/ipykernel_61639/471952310.py&quot;</span><span class="gt">, line </span><span class="mi">7</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Graduate&quot;</span><span class="p">)}</span>
-                     <span class="o">^</span>
-<span class="ne">SyntaxError</span>: unmatched &#39;}&#39;
+<span class="c1"># conditional block below here</span>
 </pre></div>
 </div>
 </div>
@@ -1017,6 +959,12 @@ <h2>Aside: the concept of scope<a class="headerlink" href="#aside-the-concept-of
 </pre></div>
 </div>
 </div>
+<div class="cell_output docutils container">
+<div class="output stream highlight-myst-ansi notranslate"><div class="highlight"><pre><span></span>Go ahead
+hello world!
+</pre></div>
+</div>
+</div>
 </div>
 <p>The answer: only once! Because both print statements are scoped (indented inside) a conditional branch, it will only execute once: either in the true (if) branch or the false (else) branch.</p>
 </section>
@@ -1033,8 +981,8 @@ <h3>Conditional execution<a class="headerlink" href="#conditional-execution" tit
 <li><p>Only stop someone if they’re above the speed limit</p></li>
 <li><p>Tell me if someone is coming!</p></li>
 <li><p>Look through the bag and only pull out the red skittles</p></li>
-<li><p>Can you think of any others?</p></li>
 </ul>
+<p>Can you think of any others?</p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="c1"># generic</span>
 <span class="k">if</span> <span class="n">booleanExpression</span><span class="p">:</span>
     <span class="c1"># do something</span>
@@ -1060,9 +1008,12 @@ <h3>Chained conditionals<a class="headerlink" href="#chained-conditionals" title
 <p>Sometimes you have more than two choices of paths (branches). In that case you need an elif.</p>
 <p>The difference from the basic conditional is something like this:</p>
 <a class="bg-primary mb-1 reference internal image-reference" href="_images/conditional-logic-chained.png"><img alt="_images/conditional-logic-chained.png" class="bg-primary mb-1 align-center" src="_images/conditional-logic-chained.png" style="width: 600px;" /></a>
-<p>Simple example: you have a fever if you’re above 100, hypothermia if you’re under 95; otherwise, you’re all good!</p>
-<p>Or, choosing an outfit depending on where you want to go (in the Spring in Maryland!).</p>
-<p>Or, choosing a football play depending on what you think the defense is showing.</p>
+<p>Some examples:</p>
+<ul class="simple">
+<li><p>you have a fever if you’re above 100, hypothermia if you’re under 95; otherwise, you’re all good!</p></li>
+<li><p>choosing an outfit depending on where you want to go (in the Spring in Maryland!).</p></li>
+<li><p>choosing a football play depending on what you think the defense is showing.</p></li>
+</ul>
 <p>Any other examples?</p>
 <p>The key difference between this type of conditional block and the regular “if/else” blocks is that you need more than one Boolean expression; one for each <code class="docutils literal notranslate"><span class="pre">if</span></code> or <code class="docutils literal notranslate"><span class="pre">elif</span></code> statement.</p>
 <p>Here’s the generic structure:</p>
@@ -1090,6 +1041,20 @@ <h3>Chained conditionals<a class="headerlink" href="#chained-conditionals" title
 </pre></div>
 </div>
 </div>
+<div class="cell_output docutils container">
+<div class="output traceback highlight-ipythontb notranslate"><div class="highlight"><pre><span></span><span class="gt">---------------------------------------------------------------------------</span>
+<span class="ne">NameError</span><span class="g g-Whitespace">                                 </span>Traceback (most recent call last)
+<span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">folders</span><span class="o">/</span><span class="n">xz</span><span class="o">/</span><span class="n">_hjc5hsx743dclmg8n5678nc0000gn</span><span class="o">/</span><span class="n">T</span><span class="o">/</span><span class="n">ipykernel_71416</span><span class="o">/</span><span class="mf">2872807073.</span><span class="n">py</span> <span class="ow">in</span> <span class="o">&lt;</span><span class="n">module</span><span class="o">&gt;</span>
+<span class="ne">----&gt; </span><span class="mi">1</span> <span class="k">if</span> <span class="n">gpa</span> <span class="o">&gt;=</span> <span class="n">gpa_threshold</span> <span class="ow">and</span> <span class="n">required_courses</span> <span class="o">&gt;=</span> <span class="n">req_threshold</span><span class="p">:</span>
+<span class="g g-Whitespace">      </span><span class="mi">2</span>     <span class="c1"># then something</span>
+<span class="g g-Whitespace">      </span><span class="mi">3</span>     <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;graduate!&quot;</span><span class="p">)</span>
+<span class="g g-Whitespace">      </span><span class="mi">4</span> <span class="k">elif</span> <span class="n">gpa</span> <span class="o">&gt;=</span> <span class="n">gpa_threshold</span> <span class="ow">and</span> <span class="n">required_courses</span> <span class="o">&lt;</span> <span class="n">req_threshold</span><span class="p">:</span>
+<span class="g g-Whitespace">      </span><span class="mi">5</span>     <span class="c1"># then something else</span>
+
+<span class="ne">NameError</span>: name &#39;gpa_threshold&#39; is not defined
+</pre></div>
+</div>
+</div>
 </div>
 <div class="cell docutils container">
 <div class="cell_input docutils container">
@@ -1117,12 +1082,7 @@ <h3>Chained conditionals<a class="headerlink" href="#chained-conditionals" title
 <span class="c1"># otherwise pay normal price (15)</span>
 <span class="n">age</span> <span class="o">=</span> <span class="mi">65</span>
 <span class="n">theater_staff</span> <span class="o">=</span> <span class="kc">True</span>
-<span class="k">if</span> <span class="n">age</span> <span class="o">&lt;</span> <span class="mi">5</span> <span class="ow">or</span> <span class="n">age</span> <span class="o">&gt;=</span> <span class="mi">65</span><span class="p">:</span>
-    <span class="n">price</span> <span class="o">=</span> <span class="mi">0</span>
-<span class="k">elif</span> <span class="n">theater_staff</span> <span class="o">==</span> <span class="kc">True</span><span class="p">:</span>
-    <span class="n">price</span> <span class="o">=</span> <span class="mf">7.50</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="n">price</span> <span class="o">=</span> <span class="mi">15</span>
+<span class="c1"># chained conditional block below here</span>
 </pre></div>
 </div>
 </div>
@@ -1140,14 +1100,7 @@ <h3>Chained conditionals<a class="headerlink" href="#chained-conditionals" title
 <span class="n">target_date</span> <span class="o">=</span> <span class="mi">36</span>
 <span class="n">score</span> <span class="o">=</span> <span class="mi">1</span>
 
-<span class="k">if</span> <span class="n">submission_date</span> <span class="o">&lt;=</span> <span class="n">target_date</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="n">score</span><span class="p">)</span>
-<span class="k">elif</span> <span class="n">submission_date</span> <span class="o">&lt;=</span> <span class="n">target_date</span> <span class="o">+</span> <span class="mi">1</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="mf">0.85</span><span class="o">*</span><span class="n">score</span><span class="p">)</span>
-<span class="k">elif</span> <span class="n">submission_date</span> <span class="o">&lt;=</span> <span class="n">target_date</span> <span class="o">+</span> <span class="mi">2</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="mf">0.7</span><span class="o">*</span><span class="n">score</span><span class="p">)</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="mf">0.0</span><span class="p">)</span>
+<span class="c1"># chained conditional block below here</span>
 </pre></div>
 </div>
 </div>
@@ -1196,13 +1149,7 @@ <h3>Nested conditionals<a class="headerlink" href="#nested-conditionals" title="
 <span class="n">registration_here</span> <span class="o">=</span> <span class="kc">True</span>
 <span class="n">need_assistance</span> <span class="o">=</span> <span class="kc">False</span>
 
-<span class="k">if</span> <span class="ow">not</span> <span class="n">registration_here</span><span class="p">:</span>
-    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Go away to your actual registration location&quot;</span><span class="p">)</span>
-<span class="k">else</span><span class="p">:</span>
-    <span class="k">if</span> <span class="n">need_assistance</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Go to assisted booth&quot;</span><span class="p">)</span>
-    <span class="k">else</span><span class="p">:</span>
-        <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Go to normal booth&quot;</span><span class="p">)</span>
+<span class="c1"># nested conditional block below here</span>
 </pre></div>
 </div>
 </div>