Upload app.py

app.py

@@ -49,12 +49,14 @@ workflow_context = {
 
 # Optimized parameters for HF Spaces
 HF_OPTIMIZED_PARAMS = {
-    "iters": 20,  # Reduced from 50
-    "complexity": 8,  # Reduced from 12
-    "generations": 15,  # Reduced from 30
-    "population_size": 50,  # Reduced from 100
-    "test_set_frac": 0.2,  # Increased for faster validation
-    "random_state": 42
+    "iters": 30,  # Increased for better circuit detection
+    "complexity": 10,  # Increased for better circuit detection  
+    "generations": 20,  # Increased for better circuit detection
+    "population_size": 50,  # Keep moderate for memory
+    "tol": 1e-3,  # Tighter tolerance for better fits
+    "parallel": True,  # Enable parallel processing
+    "terminals": "RLP",  # R: resistor, L: inductor, P: constant-phase element
+    "seed": 42  # Random seed for reproducibility
 }
 
 def parse_workflow_params(request: gr.Request) -> Dict[str, Any]:
@@ -223,20 +225,23 @@ def analyze_eis_optimized(
             if progress_callback:
                 progress_callback(0.4, "Detecting circuit model...")
             
-            # Use simpler approach for HF
-            circuits = ae.core.generate_equivalent_circuits(
-                Z,
-                freq,
+            # Use simpler approach for HF - corrected parameter order and names
+            circuits_df = ae.core.generate_equivalent_circuits(
+                freq,  # Frequency array (correct order)
+                Z,     # Impedance array (correct order)
                 iters=params.get("iters", 20),
                 complexity=params.get("complexity", 8),
                 generations=params.get("generations", 15),
                 population_size=params.get("population_size", 50),
-                test_set_frac=params.get("test_set_frac", 0.2),
-                random_state=params.get("random_state", 42)
+                tol=params.get("tol", 1e-2),
+                parallel=params.get("parallel", True),
+                terminals=params.get("terminals", "RLP"),
+                seed=params.get("seed", 42)
             )
             
-            if circuits and len(circuits) > 0:
-                circuit_str = circuits[0]  # Take the best circuit
+            if circuits_df is not None and len(circuits_df) > 0:
+                # Extract the best circuit string from the DataFrame
+                circuit_str = circuits_df.iloc[0]['circuitstring']  # Take the best circuit
             else:
                 circuit_str = "R0-[R1,C1]"  # Fallback simple circuit
         else:
@@ -456,11 +461,12 @@ def create_interface():
                 
                 with gr.Row():
                     gr.Markdown("""
-                    **Optimization Settings (when enabled):**
-                    - Reduced iterations: 20 (vs 50)
-                    - Lower complexity: 8 (vs 12)
-                    - Smaller population: 50 (vs 100)
-                    - Faster validation: 20% test set
+                    **HF-Optimized Settings (when enabled):**
+                    - Circuit iterations: 30 (balanced performance/accuracy)
+                    - Complexity limit: 10 (prevents overfitting)
+                    - Population size: 50 (memory efficient)
+                    - Tolerance: 1e-3 (good fit quality)
+                    - Components: R (resistors), L (inductors), P (CPE)
                     """)
             
             # Results Tab