week 2 solutions

Author: bjmorgan

CH40208/_toc.yml

@@ -130,3 +130,5 @@ parts:
           title: Functions
         - file: worked_examples/week_2_comparisons_and_flow_control
           title: Comparisons and Flow Control
+        - file: worked_examples/week_2_advanced_loop_control
+          title: Advanced Loop Control

CH40208/worked_examples/week_2_advanced_loop_control.ipynb

@@ -133,7 +133,7 @@
    "id": "279bb483-4bc6-4c8a-bf11-ee2addec3bff",
    "metadata": {},
    "source": [
-    "**Solution:**"
+    "### Solution"
    ]
   },
   {
@@ -310,47 +310,12 @@
     "- If `converged = False`: loop exited because iteration limit was reached"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5f3cbd1f-5e98-4d8c-911b-8f08f7130f1a",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "temperature = 100.0  # Starting temperature in °C\n",
-    "room_temperature = 20.0  # Ambient temperature in °C\n",
-    "threshold = 0.5  # Stop when within 0.5°C of room temp\n",
-    "cooling_rate = 0.02  # Cool by 2% per step\n",
-    "iteration = 0\n",
-    "max_iterations = 100\n",
-    "converged = temperature - room_temperature <= threshold\n",
-    "\n",
-    "while not converged and iteration < max_iterations:\n",
-    "    # Cool by 2% of the temperature difference each step\n",
-    "    temperature_difference = temperature - room_temperature\n",
-    "    temperature = temperature - cooling_rate * temperature_difference\n",
-    "    iteration += 1\n",
-    "    print(f\"Step {iteration}: Temperature = {temperature:.2f}°C\")\n",
-    "\n",
-    "    if temperature - room_temperature <= threshold:\n",
-    "        converged = True\n",
-    "\n",
-    "# Report results based on whether convergence was achieved\n",
-    "if converged:\n",
-    "    print(f\"\\nThermal equilibrium reached after {iteration} steps\")\n",
-    "    print(f\"Final temperature: {temperature:.2f}°C\")\n",
-    "else:\n",
-    "    print(f\"\\nIteration limit reached after {iteration} steps\")\n",
-    "    print(f\"Current temperature: {temperature:.2f}°C (still {temperature - room_temperature:.2f}°C above room temperature)\")\n",
-    "    print(\"More time needed for thermal equilibrium\")"
-   ]
-  },
   {
    "cell_type": "markdown",
    "id": "9288c3e4-7c88-48c9-b5b8-5bb886db08ec",
    "metadata": {},
    "source": [
-    "**Alternative Solution: Using `break`**\n",
+    "### Alternative Solution 1: Using `break`\n",
     "\n",
     "An alternative approach uses `break` to exit the loop early when the iteration limit is reached. This separates the two exit conditions rather than combining them in the `while` statement.\n",
     "\n",
@@ -386,7 +351,7 @@
    "id": "64a6b608-c652-4619-85c3-3324a321b248",
    "metadata": {},
    "source": [
-    "** Alternative Solution: Using a Function to Test Convergence**\n",
+    "### Alternative Solution 2: Using a Function to Test Convergence\n",
     "\n",
     "In the main solution, we test the convergence condition twice:\n",
     "1. Before the loop: `converged = temperature - room_temperature <= threshold`\n",
@@ -477,10 +442,18 @@
     "    return abs(temperature - room_temperature) <= threshold\n",
     "```\n",
     "\n",
-    "With a function, this is a one-line change. Without it, we'd need to find and update both occurrences, risking mistakes if we miss one.\n",
+    "With a function, this is a one-line change. Without it, we'd need to find and update both occurrences, risking bugs if we miss one.\n",
     "\n",
     "**Trade-off:** For very simple conditions used only 2-3 times in short code, a function might be overkill. But as code grows in complexity, extracting repeated logic into functions becomes increasingly valuable."
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b14658e8-8971-47b3-883c-f42fcbba4f36",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {