post TR1 commit

Author: eyrei123

marimo-notebook/README.md

@@ -4,6 +4,7 @@ You should create a new folder named marimo on your computer and place each of t
 
 Your download bundle contains the following files:
 
+hypotenuse_calculator.py                      - This file contains the original hypotenuse_calculator code
 hypotenuse_calculator_before_update.py        - This file contains the code before any updating is attempted.  The code has been deliberately placed out of order, however it runs cleanly.
 hypotenuse_calculator_duplicate_variable.py   - This file shows the effect of re-defining a variable. This file produces an error.
 hypotenuse_calculator_after_update.py         - This file contains the code after the `adjacent` variable was updated to `10`. This file runs cleanly.
@@ -17,5 +18,7 @@ packages.py    - This file contains the code used to demonstrate sandboxing.
 quadratic.py   - This file contains the marimo notebook version of the quadratic formula example.
 equation.py    - This file contains the Python script version of quadratic.py.
 
+simultaneous_equations.py     - This file contains the code used to demonstrate marimo's UI elements.
+simultaneous_equations_ui.py  - This file contains a possible solution to the challenge skills test.
 
 hidden_state.ipynb - This file contains a Jupyter Notebook that can be used as a starting point for the investigation of its problems. You should adjust it as instructed in the tutorial. 

marimo-notebook/break_even_analysis_UI_elements.py

@@ -4,38 +4,37 @@
 app = marimo.App(width="medium")
 
 
-@app.cell
-def _():
-    import marimo as mo
-
-    return (mo,)
+app._unparsable_cell(
+    r"""
+    oimport marimo as mo
+    """,
+    name="_",
+)
 
 
 @app.cell
 def _(
-    drop_color_costs,
-    drop_quantity,
-    rd_fixed_cost,
-    sl_cost_price,
-    text_selling_price,
+    ui_color_costs,
+    ui_fixed_cost,
+    ui_quantity,
+    ui_selling_price,
+    ui_unit_cost,
 ):
     import matplotlib.pyplot as plt
 
-    fixed_cost = int(rd_fixed_cost.value)
-    unit_cost = sl_cost_price.value
-    selling_price = float(text_selling_price.value)
-    upper_production_quantity = drop_quantity.value
+    fixed_cost = int(ui_fixed_cost.value)
+    unit_cost = ui_unit_cost.value
+    selling_price = float(ui_selling_price.value)
+    upper_production_quantity = ui_quantity.value
 
     break_even_quantity = fixed_cost / (selling_price - unit_cost)
     break_even_income = break_even_quantity * selling_price
 
-    units = [
-        quantity * 1000 for quantity in range(upper_production_quantity + 1)
-    ]
+    units = range(0, upper_production_quantity + 1, 1000)
     unit_costs = [(unit * unit_cost) + fixed_cost for unit in units]
     sales_income = [unit * selling_price for unit in units]
 
-    plt.plot(units, unit_costs, marker="o", color=drop_color_costs.value)
+    plt.plot(units, unit_costs, marker="o", color=ui_color_costs.value)
     plt.plot(units, sales_income, marker="x")
 
     plt.xlabel("Units Produced")
@@ -73,41 +72,41 @@ def _(
 @app.cell
 def _(mo):
     options = ["40000", "50000"]
-    rd_fixed_cost = mo.ui.radio(options=options, value="50000")
+    ui_fixed_cost = mo.ui.radio(options=options, value="50000")
 
-    sl_cost_price = mo.ui.slider(start=2, stop=5, step=1)
+    ui_unit_cost = mo.ui.slider(start=2, stop=5, step=1)
 
-    text_selling_price = mo.ui.text(value="10")
+    ui_selling_price = mo.ui.text(value="10")
 
-    drop_quantity = mo.ui.dropdown(
-        options={"10000": 10, "12000": 12, "15000": 15}, value="10000"
+    ui_quantity = mo.ui.dropdown(
+        options={"10000": 10000, "12000": 12000, "15000": 15000}, value="10000"
     )
 
-    sw_disply_break_even = mo.ui.switch()
+    ui_disply_break_even = mo.ui.switch()
 
-    drop_color_costs = mo.ui.dropdown(
+    ui_color_costs = mo.ui.dropdown(
         options={"Red": "red", "Green": "green", "Blue": "blue"}, value="Red"
     )
 
     mo.md(
         f"""
-        Select Fixed Costs: {rd_fixed_cost}
+        Select Fixed Costs: {ui_fixed_cost}
 
-        Select Unit Cost Price: {sl_cost_price}
+        Select Unit Cost Price: {ui_unit_cost}
 
-        Enter Selling Price: {text_selling_price}
+        Enter Selling Price: {ui_selling_price}
 
-        Select a Maximum Quantity: {drop_quantity}
+        Select a Maximum Production Quantity: {ui_quantity}
         """
     )
     return (
-        drop_color_costs,
-        drop_quantity,
         options,
-        rd_fixed_cost,
-        sl_cost_price,
-        sw_disply_break_even,
-        text_selling_price,
+        ui_color_costs,
+        ui_disply_break_even,
+        ui_fixed_cost,
+        ui_quantity,
+        ui_selling_price,
+        ui_unit_cost,
     )
 
 

marimo-notebook/break_even_analysis_chart_code.py

@@ -11,12 +11,12 @@ def _():
     fixed_cost = 50000
     unit_cost = 2
     selling_price = 10
-    unit_range = 10
+    upper_production_quantity = 10000
 
     break_even_quantity = fixed_cost / (selling_price - unit_cost)
     break_even_income = fixed_cost + break_even_quantity * unit_cost
 
-    units = [x * 1000 for x in range(unit_range)]
+    units = range(0, upper_production_quantity + 1, 1000)
     unit_costs = [(x * unit_cost) + fixed_cost for x in units]
     sales_income = [unit * selling_price for unit in units]
 
@@ -50,7 +50,7 @@ def _():
         selling_price,
         unit_cost,
         unit_costs,
-        unit_range,
+        upper_production_quantity,
         units,
     )
 

marimo-notebook/break_even_analysis_solution.py

@@ -13,36 +13,36 @@ def _():
 
 @app.cell
 def _(
-    drop_plot_color,
-    drop_quantity,
-    rd_fixed_cost,
-    sl_cost_price,
-    sw_break_even,
-    text_selling_price,
+    ui_break_even,
+    ui_fixed_cost,
+    ui_plot_color,
+    ui_quantity,
+    ui_selling_price,
+    ui_unit_cost,
 ):
     import matplotlib.pyplot as plt
 
-    fixed_cost = int(rd_fixed_cost.value)
-    unit_cost = sl_cost_price.value
-    selling_price = float(text_selling_price.value)
-    unit_range = drop_quantity.value
+    fixed_cost = int(ui_fixed_cost.value)
+    unit_cost = ui_unit_cost.value
+    selling_price = float(ui_selling_price.value)
+    upper_production_quantity = ui_quantity.value
 
     break_even_quantity = fixed_cost / (selling_price - unit_cost)
     break_even_income = break_even_quantity * selling_price
 
-    units = [quantity * 1000 for quantity in range(unit_range + 1)]
+    units = range(0, upper_production_quantity + 1, 1000)
     total_costs = [(unit * unit_cost) + fixed_cost for unit in units]
     sales_income = [unit * selling_price for unit in units]
 
-    plt.plot(units, total_costs, marker="o", color=drop_plot_color.value)
+    plt.plot(units, total_costs, marker="o", color=ui_plot_color.value)
     plt.plot(units, sales_income, marker="x")
 
     plt.xlabel("Units Produced")
     plt.ylabel("($)")
     plt.legend(["Total Costs", "Total Income"])
     plt.title("Break-Even Analysis")
 
-    if sw_break_even.value:
+    if ui_break_even.value:
         plt.vlines(
             break_even_quantity,
             ymin=100,
@@ -67,53 +67,53 @@ def _(
         selling_price,
         total_costs,
         unit_cost,
-        unit_range,
         units,
+        upper_production_quantity,
     )
 
 
 @app.cell
 def _(mo):
     options = ["40000", "50000"]
-    rd_fixed_cost = mo.ui.radio(options=options, value="50000")
+    ui_fixed_cost = mo.ui.radio(options=options, value="50000")
 
-    sl_cost_price = mo.ui.slider(start=2, stop=5, step=1)
+    ui_unit_cost = mo.ui.slider(start=2, stop=5, step=1)
 
-    text_selling_price = mo.ui.text(value="10")
+    ui_selling_price = mo.ui.text(value="10")
 
-    drop_quantity = mo.ui.dropdown(
-        options={"10000": 10, "12000": 12, "15000": 15}, value="10000"
+    ui_quantity = mo.ui.dropdown(
+        options={"10000": 10000, "12000": 12000, "15000": 15000}, value="10000"
     )
 
-    sw_break_even = mo.ui.switch()
+    ui_break_even = mo.ui.switch()
 
-    drop_plot_color = mo.ui.dropdown(
+    ui_plot_color = mo.ui.dropdown(
         options={"Red": "red", "Green": "green", "Blue": "blue"}, value="Red"
     )
 
     mo.md(
         f"""
-        Select Fixed Costs: {rd_fixed_cost}
+        Select Fixed Costs: {ui_fixed_cost}
 
-        Select Unit Cost Price: {sl_cost_price}
+        Select Unit Cost Price: {ui_unit_cost}
 
-        Enter Selling Price: {text_selling_price}
+        Enter Selling Price: {ui_selling_price}
 
-        Select a Maximum Quantity: {drop_quantity}
+        Select a Maximum Quantity: {ui_quantity}
 
-        Display Break-Even Data: {sw_break_even}
+        Display Break-Even Data: {ui_break_even}
 
-        Select Total Costs Plot Color: {drop_plot_color}
+        Select Total Costs Plot Color: {ui_plot_color}
         """
     )
     return (
-        drop_plot_color,
-        drop_quantity,
         options,
-        rd_fixed_cost,
-        sl_cost_price,
-        sw_break_even,
-        text_selling_price,
+        ui_break_even,
+        ui_fixed_cost,
+        ui_plot_color,
+        ui_quantity,
+        ui_selling_price,
+        ui_unit_cost,
     )
 
 

marimo-notebook/hidden_state.ipynb

@@ -18,7 +18,7 @@
    "outputs": [],
    "source": [
     "def calculate_hypotenuse(opposite, adjacent):\n",
-    "    return math.sqrt(math.pow(opposite, 2) + math.pow(adjacent, 2))"
+    "    return math.sqrt(opposite**2 + adjacent**2)"
    ]
   },
   {
@@ -131,6 +131,14 @@
    "metadata": {},
    "outputs": [],
    "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "75cbba4e-deeb-42dc-b3da-c69f4e71eb1a",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

marimo-notebook/hypotenuse_calculator.py

@@ -0,0 +1,41 @@
+import marimo
+
+__generated_with = "0.11.0"
+app = marimo.App(width="medium")
+
+
+@app.cell
+def _(math):
+    def calculate_hypotenuse(opposite, adjacent):
+        return math.sqrt(opposite**2 + adjacent**2)
+
+    return (calculate_hypotenuse,)
+
+
+@app.cell
+def _():
+    opposite = 3
+    return (opposite,)
+
+
+@app.cell
+def _():
+    adjacent = 4
+    return (adjacent,)
+
+
+@app.cell
+def _(adjacent, calculate_hypotenuse, opposite):
+    calculate_hypotenuse(opposite, adjacent)
+    return
+
+
+@app.cell
+def _():
+    import math
+
+    return (math,)
+
+
+if __name__ == "__main__":
+    app.run()

marimo-notebook/hypotenuse_calculator_after_deletion.py

@@ -7,7 +7,7 @@
 @app.cell
 def _(math):
     def calculate_hypotenuse(opposite, adjacent):
-        return math.sqrt(math.pow(opposite, 2) + math.pow(adjacent, 2))
+        return math.sqrt(opposite**2 + adjacent**2)
 
     return (calculate_hypotenuse,)
 

marimo-notebook/hypotenuse_calculator_after_update.py

@@ -7,7 +7,7 @@
 @app.cell
 def _(math):
     def calculate_hypotenuse(opposite, adjacent):
-        return math.sqrt(math.pow(opposite, 2) + math.pow(adjacent, 2))
+        return return math.sqrt(opposite**2 + adjacent**2)
 
     return (calculate_hypotenuse,)
 

marimo-notebook/hypotenuse_calculator_before_update.py

@@ -7,7 +7,7 @@
 @app.cell
 def _(math):
     def calculate_hypotenuse(opposite, adjacent):
-        return math.sqrt(math.pow(opposite, 2) + math.pow(adjacent, 2))
+        return return math.sqrt(opposite**2 + adjacent**2)
 
     return (calculate_hypotenuse,)
 

marimo-notebook/hypotenuse_calculator_duplicate_variable.py

@@ -7,7 +7,7 @@
 @app.cell
 def _(math):
     def calculate_hypotenuse(opposite, adjacent):
-        return math.sqrt(math.pow(opposite, 2) + math.pow(adjacent, 2))
+        return return math.sqrt(opposite**2 + adjacent**2)
 
     return (calculate_hypotenuse,)