Update app.py

app.py

@@ -285,92 +285,99 @@ if 'env' not in st.session_state:
 if 'fig' not in st.session_state:
     st.session_state.fig = None
 
-def toggle_simulation():
-    st.session_state.running = not st.session_state.running
-    if st.session_state.running and st.session_state.env is None:
+def start_simulation():
+    st.session_state.running = True
+    if st.session_state.env is None:
         st.session_state.env = Environment(100, 100, effects)
         for _ in range(initial_cells):
             cell = Cell(random.uniform(0, st.session_state.env.width), random.uniform(0, st.session_state.env.height))
             st.session_state.env.add_cell(cell)
         st.session_state.fig = setup_figure(st.session_state.env)
 
-start_stop_button = st.button("Start/Stop Simulation", on_click=toggle_simulation)
+def stop_simulation():
+    st.session_state.running = False
 
-def run_simulation_step():
-    if st.session_state.running and st.session_state.env is not None:
-        for _ in range(4):  # Update 4 times per frame to increase simulation speed
-            initial_cell_count = len(st.session_state.env.cells)
-            st.session_state.env.update()
-            final_cell_count = len(st.session_state.env.cells)
-            
-            # Check for merges
-            if final_cell_count < initial_cell_count:
-                merges = initial_cell_count - final_cell_count
-                st.session_state.total_merges += merges
-                event_log.appendleft(f"Time {st.session_state.env.time}: {merges} cell merge(s) occurred!")
+# Create two columns for start and stop buttons
+col1, col2 = st.columns(2)
 
-            # Check for new cell types
-            for cell in st.session_state.env.cells:
-                if cell.cell_type not in st.session_state.env.population_history:
-                    event_log.appendleft(f"Time {st.session_state.env.time}: New cell type '{cell.cell_type}' emerged!")
+with col1:
+    start_button = st.button("Start Simulation", on_click=start_simulation)
 
-        update_chart()
+with col2:
+    stop_button = st.button("Stop Simulation", on_click=stop_simulation)
 
 def update_chart():
-    if st.session_state.running and st.session_state.fig is not None:
-        with st.session_state.fig.batch_update():
-            cell_data, population_history, colors = st.session_state.env.get_visualization_data()
-            
-            # Update cell distribution
-            for i, (cell_type, data) in enumerate(cell_data.items()):
-                st.session_state.fig.data[i].x = data["x"]
-                st.session_state.fig.data[i].y = data["y"]
-                st.session_state.fig.data[i].marker.size = data["size"]
-            
-            # Update total population
-            total_population = [sum(counts) for counts in zip(*population_history.values())]
-            st.session_state.fig.data[len(cell_data)].y = total_population
-            
-            # Update population by cell type
-            for i, (cell_type, counts) in enumerate(population_history.items()):
-                st.session_state.fig.data[len(cell_data) + 1 + i].y = counts
-            
-            # Update organelle distribution
-            organelle_counts = {"nucleus": 0, "mitochondria": 0, "chloroplast": 0, "endoplasmic_reticulum": 0, "golgi_apparatus": 0}
-            for cell in st.session_state.env.cells:
-                for organelle in cell.organelles:
-                    organelle_counts[organelle] += 1
-            st.session_state.fig.data[-1].y = list(organelle_counts.values())
+    if st.session_state.env is not None and st.session_state.fig is not None:
+        cell_data, population_history, colors = st.session_state.env.get_visualization_data()
+        
+        # Update cell distribution
+        for i, (cell_type, data) in enumerate(cell_data.items()):
+            st.session_state.fig.data[i].x = data["x"]
+            st.session_state.fig.data[i].y = data["y"]
+            st.session_state.fig.data[i].marker.size = data["size"]
+        
+        # Update total population
+        total_population = [sum(counts) for counts in zip(*population_history.values())]
+        st.session_state.fig.data[5].y = total_population
+        
+        # Update population by cell type
+        for i, (cell_type, counts) in enumerate(population_history.items()):
+            st.session_state.fig.data[6+i].y = counts
         
-        # Update live statistics
+        # Update organelle distribution
+        organelle_counts = {"nucleus": 0, "mitochondria": 0, "chloroplast": 0, "endoplasmic_reticulum": 0, "golgi_apparatus": 0}
+        for cell in st.session_state.env.cells:
+            for organelle in cell.organelles:
+                organelle_counts[organelle] += 1
+        st.session_state.fig.data[11].y = list(organelle_counts.values())
+        
+        chart_placeholder.plotly_chart(st.session_state.fig, use_container_width=True)
+
+def update_statistics():
+    if st.session_state.env is not None:
         total_cells = len(st.session_state.env.cells)
         total_cells_text.text(f"Total Cells: {format_number(total_cells)}")
         
-        cell_type_counts = {cell_type: len([c for c in st.session_state.env.cells if c.cell_type == cell_type]) for cell_type in st.session_state.env.population_history.keys()}
-        cell_type_breakdown.text("Cell Type Breakdown:\n" + "\n".join([f"{cell_type}: {format_number(count)}" for cell_type, count in cell_type_counts.items()]))
+        cell_type_counts = {cell_type: len([cell for cell in st.session_state.env.cells if cell.cell_type == cell_type]) for cell_type in st.session_state.env.population_history.keys()}
+        breakdown = "\n".join([f"{cell_type}: {format_number(count)}" for cell_type, count in cell_type_counts.items()])
+        cell_type_breakdown.text(f"Cell Type Breakdown:\n{breakdown}")
         
         dominant_type = max(cell_type_counts, key=cell_type_counts.get)
         dominant_type_text.text(f"Dominant Type: {dominant_type}")
         
         avg_energy = sum(cell.energy for cell in st.session_state.env.cells) / total_cells if total_cells > 0 else 0
-        avg_energy_text.text(f"Avg Energy: {avg_energy:.2f}")
+        avg_energy_text.text(f"Average Energy: {avg_energy:.2f}")
         
         total_merges_text.text(f"Total Merges: {st.session_state.total_merges}")
         
-        # Update event log
-        event_log_text.text("Recent Events:\n" + "\n".join(event_log))
-        
-        chart_placeholder.plotly_chart(st.session_state.fig, use_container_width=True)
+        event_log_text.text("\n".join(event_log))
 
-# Main loop placeholder
-main_placeholder = st.empty()
+# Main simulation loop
+simulation_container = st.empty()
 
-# Main loop
 while True:
-    with main_placeholder.container():
-        run_simulation_step()
+    with simulation_container.container():
+        if st.session_state.running and st.session_state.env is not None:
+            for _ in range(4):  # Update 4 times per frame to increase simulation speed
+                initial_cell_count = len(st.session_state.env.cells)
+                st.session_state.env.update()
+                final_cell_count = len(st.session_state.env.cells)
+                
+                # Check for merges
+                if final_cell_count < initial_cell_count:
+                    merges = initial_cell_count - final_cell_count
+                    st.session_state.total_merges += merges
+                    event_log.appendleft(f"Time {st.session_state.env.time}: {merges} cell merges occurred")
+            
+            update_chart()
+            update_statistics()
+        
         time.sleep(update_interval)
     
-    # Break the loop if the simulation is stopped
+    simulation_container.empty()
+
+    # Break the loop if the simulation is not running
     if not st.session_state.running:
-        break
+        break
+
+st.write("Simulation stopped. Click 'Start Simulation' to run again.")