[opt] hide feeble plants in HVA mode

app.py

@@ -1,6 +1,7 @@
 import gradio as gr
 import pandas as pd
-import pulp
+
+# import pulp
 import numpy as np
 from numpy.typing import NDArray
 from pyscipopt import Model, quicksum
@@ -170,9 +171,9 @@ def calculator(*args):
                     # total_count += v
 
             if optimal_total_value == budget:
-                return f"\nGreat! Found a combination of items with a total value equal to the budget ({budget} {currency}).😃\n\n{''.join(solution)}\nTotal Price: {int(optimal_total_value)} {currency}\n"  # Count: {int(model.getObjVal())}
+                return f"Great! Found a combination of items with a total value equal to the budget ({budget} {currency}).😃\n\n{''.join(solution)}\nTotal value: {int(optimal_total_value)} {currency}\n"  # Count: {int(model.getObjVal())}
             else:
-                return f"Oops! {int(budget - optimal_total_value)} {currency} short of the target value ({budget} {currency}).😂\n\n{''.join(solution)}\nTotal value: {int(optimal_total_value)} {currency}\n"  # Count: {int(model.getObjVal())}
+                return f"Oops! {int(budget - optimal_total_value)} {currency} short of the target value ({budget} {currency}).😣\n\n{''.join(solution)}\nTotal value: {int(optimal_total_value)} {currency}\n"  # Count: {int(model.getObjVal())}
         else:
             return "No solution found for the second optimization!"
     else:
@@ -195,8 +196,6 @@ with gr.Blocks(css=css) as demo:
         """
     )
 
-    gold_or_gems = gr.State("gold")
-
     # Create a Gradio interface with a column layout
     with gr.Column():
         # Add a row for the currency selection
@@ -247,7 +246,7 @@ with gr.Blocks(css=css) as demo:
             info="Select a strategy:",
         )
 
-    def show_plant_boxes(currency):
+    def show_plant_boxes(currency, acquisition_rate):
         # Update the state variable
 
         inventory = {}
@@ -256,24 +255,25 @@ with gr.Blocks(css=css) as demo:
         for _, row in df.iterrows():
             # Check if the plant should be shown based on the selected currency
             if row[currency] != 0:
-                species_set.add(row["species"])
-                # Create the Number component for the plant inventory
-                inventory[f"{row['species']}_{row['tier']}"] = gr.Number(
-                    label=PLANTS_LABLES[row["species"]],
-                    info=f"{PLANTS_TIERS[row['tier']]} ${row[currency]}",
-                    value=0,
-                    precision=0,
-                    minimum=0,
-                    maximum=500,
-                    step=10,
-                    visible=True,
-                    elem_classes=(
-                        f"first-{currency}-box"
-                        if len(species_set) > species_count
-                        else None
-                    ),
-                )
-                species_count = len(species_set)
+                if acquisition_rate == 0 or row["tier"] != "feeble":
+                    species_set.add(row["species"])
+                    # Create the Number component for the plant inventory
+                    inventory[f"{row['species']}_{row['tier']}"] = gr.Number(
+                        label=PLANTS_LABLES[row["species"]],
+                        info=f"{PLANTS_TIERS[row['tier']]} ${row[currency]}",
+                        value=0,
+                        precision=0,
+                        minimum=0,
+                        maximum=500,
+                        step=10,
+                        visible=True,
+                        elem_classes=(
+                            f"first-{currency}-box"
+                            if len(species_set) > species_count
+                            else None
+                        ),
+                    )
+                    species_count = len(species_set)
             else:
                 # If not shown, create a dummy invisible component
                 inventory[f"{row['species']}_{row['tier']}"] = gr.Number(visible=False)
@@ -283,7 +283,7 @@ with gr.Blocks(css=css) as demo:
 
     # Create the dynamic plant inventory inputs
     with gr.Row() as inventory_row:
-        inventory = show_plant_boxes(gold_or_gems.value)
+        inventory = show_plant_boxes(currency_radio.value, acquisition_rate.value)
 
     # Add a row for the Clear and Calculate buttons
     with gr.Row():
@@ -299,17 +299,28 @@ with gr.Blocks(css=css) as demo:
     # Set up the button click event to call the calculator function
     submit_btn.click(
         calculator,
-        inputs=[gold_or_gems, budget, selected_strategy, acquisition_rate] + inventory,
+        inputs=[currency_radio, budget, selected_strategy, acquisition_rate]
+        + inventory,
         outputs=[result],
         api_name=False,
     )
 
     # Update the inventory when the currency changes
     currency_radio.change(
-        fn=lambda selected_currency: show_plant_boxes(selected_currency)
-        + [selected_currency],  # Adjusted function to return only the components
-        inputs=currency_radio,
-        outputs=inventory + [gold_or_gems],  # Update each child in the inventory_row
+        fn=lambda selected_currency, hva_rate: show_plant_boxes(
+            selected_currency, hva_rate
+        ),  # Adjusted function to return only the components
+        inputs=[currency_radio, acquisition_rate],
+        outputs=inventory,  # Update each child in the inventory_row
+    )
+
+    # Update the inventory when the acquisition rate changes
+    acquisition_rate.change(
+        fn=lambda selected_currency, hva_rate: show_plant_boxes(
+            selected_currency, hva_rate
+        ),  # Adjusted function to return only the components
+        inputs=[currency_radio, acquisition_rate],
+        outputs=inventory,  # Update each child in the inventory_row
     )
 
 # Launch the Gradio application