Update app.py

app.py

@@ -5,19 +5,15 @@ import itertools
 # Available Capacitor Units (kVAR)
 available_capacitors = [25, 20, 15, 10, 5, 2.5, 1.5, 1]
 
-
 def calculate_power_parameters(voltage, current, power_factor):
     if voltage > 0 and current > 0:
         apparent_power = math.sqrt(3) * voltage * current
         real_power = apparent_power * power_factor / 1000
-
         try:
             reactive_power = math.sqrt((apparent_power / 1000) ** 2 - real_power ** 2)
         except ValueError:
             reactive_power = 0.0
-
         calculated_pf = real_power * 1000 / apparent_power if apparent_power > 0 else 0
-
         return {
             "apparent_power": round(apparent_power, 2),
             "real_power": round(real_power, 2),
@@ -27,45 +23,37 @@ def calculate_power_parameters(voltage, current, power_factor):
     else:
         return None
 
-
-def design_unique_capacitor_bank(reactive_power, num_caps):
+def design_capacitor_bank(reactive_power, num_caps):
     if reactive_power > 0 and num_caps > 0:
         best_combo = None
+        min_error = float('inf')
 
-        for combo in itertools.combinations_with_replacement(available_capacitors, int(num_caps)):
-            if len(set(combo)) < num_caps:
-                continue  # Avoid reuse unless necessary
-
+        for combo in itertools.combinations_with_replacement(available_capacitors, num_caps):
             total = sum(combo)
+            error = abs(total - reactive_power)
 
-            if abs(total - reactive_power) < 0.01:
+            if error < min_error:
+                min_error = error
                 best_combo = combo
+
+            if error == 0:
                 break
 
         if best_combo:
             suggested_capacitors = [f"{cap} kVAR" for cap in best_combo]
             total_kvar = sum(best_combo)
-            message = f"✅ Exact Match! Total Compensation: {round(total_kvar, 2)} kVAR"
+            message = f"Total Compensation: {round(total_kvar, 2)} kVAR"
             return {
                 "suggested_capacitors": suggested_capacitors,
                 "total_kvar": round(total_kvar, 2),
                 "message": message,
-                "mismatch": False
             }
         else:
-            return {
-                "message": "❌ No exact match found with the selected number of capacitors.",
-                "suggested_capacitors": [],
-                "total_kvar": 0,
-                "mismatch": True
-            }
-    return None
-
-
-reactive_power_state = gr.State(0.0)
-
+            return {"message": "Could not find a suitable combination."}
+    else:
+        return None
 
-def compute_reactive_power(voltage, current, power_factor):
+def reactive_power_first(voltage, current, power_factor):
     power_results = calculate_power_parameters(voltage, current, power_factor)
     if power_results:
         apparent_power_out = f"Apparent Power: **{power_results['apparent_power']} VA**"
@@ -80,59 +68,63 @@ def compute_reactive_power(voltage, current, power_factor):
             power_results['reactive_power']
         )
     else:
-        return ("Invalid Input", "", "", "", 0.0)
+        return ("⚠️ Please enter valid Voltage and Current!", "", "", "", 0)
 
-
-def process_capacitor_bank(reactive_power, num_caps):
-    cap_bank_design = design_unique_capacitor_bank(reactive_power, num_caps)
-    if cap_bank_design and not cap_bank_design['mismatch']:
+def finalize_capacitor_bank(reactive_power, num_caps):
+    cap_bank_design = design_capacitor_bank(reactive_power, num_caps)
+    if cap_bank_design and cap_bank_design.get("suggested_capacitors"):
         suggested_capacitors_text = "<br>".join(
             [f"🔹 Capacitor {idx + 1}: **{cap}**" for idx, cap in enumerate(cap_bank_design['suggested_capacitors'])]
         )
         return suggested_capacitors_text, cap_bank_design['message']
     else:
-        return "<span style='color:red'>No exact match found.</span>", cap_bank_design['message']
-
+        return "Could not find a suitable combination.", ""
 
-with gr.Blocks(title="Three-Phase Power Calculator") as app:
+with gr.Blocks() as iface:
+    gr.Markdown("# ⚡ Three-Phase Power Calculator - Reactive Power Compensation")
     gr.Markdown("""
-    # ⚡ Three-Phase Power Calculator & Capacitor Bank Designer
-    Compute power parameters and precisely design your capacitor bank with no mismatch.
+    Step 1: Enter system parameters to calculate apparent and reactive power.
+    Step 2: Input number of capacitors to compute optimal configuration.
     """)
 
     with gr.Row():
-        voltage_input = gr.Number(label="Voltage (V)", value=415)
-        current_input = gr.Number(label="Current (A)", value=250)
-        pf_input = gr.Slider(label="Power Factor", minimum=0.0, maximum=1.0, value=0.85, step=0.01)
-
-    freq_input = gr.Radio(label="Select Frequency (Hz)", choices=[50, 60], value=50)
-    compute_btn = gr.Button("Compute Power")
-
-    app_output = gr.HTML()
-    real_output = gr.HTML()
-    reactive_output = gr.HTML()
-    pf_output = gr.HTML()
-
-    compute_btn.click(
-        compute_reactive_power,
-        inputs=[voltage_input, current_input, pf_input],
-        outputs=[app_output, real_output, reactive_output, pf_output, reactive_power_state]
+        voltage = gr.Number(label="Enter Voltage (V)", value=415)
+        current = gr.Number(label="Enter Current (A)", value=250)
+        power_factor = gr.Slider(label="Power Factor", minimum=0.0, maximum=1.0, value=0.85, step=0.01)
+        frequency = gr.Radio(label="Select Frequency", choices=[50, 60], value=50)
+
+    calc_btn = gr.Button("🔍 Calculate Power Parameters")
+
+    apparent_power_out = gr.HTML()
+    real_power_out = gr.HTML()
+    reactive_power_out = gr.HTML()
+    calculated_pf_out = gr.HTML()
+    reactive_value = gr.State()  # Store the reactive power for reuse
+
+    calc_btn.click(
+        fn=reactive_power_first,
+        inputs=[voltage, current, power_factor],
+        outputs=[
+            apparent_power_out,
+            real_power_out,
+            reactive_power_out,
+            calculated_pf_out,
+            reactive_value
+        ]
     )
 
-    gr.Markdown("""
-    ### Capacitor Bank Design (Only exact match results are accepted)
-    """)
+    gr.Markdown("### ➕ Enter number of capacitors to compensate reactive power:")
+    num_caps_input = gr.Number(label="Number of Capacitors", precision=0)
+    finalize_btn = gr.Button("⚙️ Generate Capacitor Bank")
 
-    num_caps_input = gr.Number(label="Enter Number of Capacitors", value=2)
-    cap_btn = gr.Button("Design Capacitor Bank")
-    cap_suggestion = gr.HTML()
-    cap_message = gr.HTML()
+    capacitor_out = gr.HTML()
+    total_comp_out = gr.HTML()
 
-    cap_btn.click(
-        process_capacitor_bank,
-        inputs=[reactive_power_state, num_caps_input],
-        outputs=[cap_suggestion, cap_message]
+    finalize_btn.click(
+        fn=finalize_capacitor_bank,
+        inputs=[reactive_value, num_caps_input],
+        outputs=[capacitor_out, total_comp_out]
     )
 
 if __name__ == "__main__":
-    app.launch()
+    iface.launch()