Update app.py

app.py

@@ -1,4 +1,4 @@
-# boids_streamlit_advanced.py
+# boids_streamlit.py
 
 import streamlit as st
 import numpy as np
@@ -10,7 +10,7 @@ class Boid:
     def __init__(self, position, velocity):
         self.position = np.array(position, dtype='float64')
         self.velocity = np.array(velocity, dtype='float64')
-        self.acceleration = np.zeros(2, dtype='float64')
+        self.history = []
 
     def update(self, boids, width, height, params):
         self.flock(boids, params)
@@ -25,98 +25,97 @@ class Boid:
         self.position[0] = self.position[0] % width
         self.position[1] = self.position[1] % height
 
+        # 履歴に現在の位置を追加
+        if params['draw_trail']:
+            self.history.append(self.position.copy())
+            if len(self.history) > params['max_history']:
+                self.history.pop(0)
+
     def flock(self, boids, params):
-        alignment = self.align(boids, params)
-        cohesion = self.cohere(boids, params)
-        separation = self.separate(boids, params)
+        self.acceleration = np.zeros(2, dtype='float64')
+        self.fly_towards_center(boids, params)
+        self.avoid_others(boids, params)
+        self.match_velocity(boids, params)
+        self.limit_speed(params)
 
-        self.acceleration += alignment * params['align_weight']
-        self.acceleration += cohesion * params['cohesion_weight']
-        self.acceleration += separation * params['separation_weight']
+    def fly_towards_center(self, boids, params):
+        centering_factor = params['centering_factor']
+        center_x = 0.0
+        center_y = 0.0
+        num_neighbors = 0
 
-    def align(self, boids, params):
-        steering = np.zeros(2, dtype='float64')
-        total = 0
         for other in boids:
-            distance = np.linalg.norm(other.position - self.position)
-            if other != self and distance < params['neighbor_radius']:
-                steering += other.velocity
-                total += 1
-        if total > 0:
-            steering /= total
-            steering = self.set_magnitude(steering, params['max_speed'])
-            steering -= self.velocity
-            steering = self.limit(steering, params['max_force'])
-        return steering
-
-    def cohere(self, boids, params):
-        steering = np.zeros(2, dtype='float64')
-        total = 0
+            if other is not self and self.distance(other) < params['visual_range']:
+                center_x += other.position[0]
+                center_y += other.position[1]
+                num_neighbors += 1
+
+        if num_neighbors > 0:
+            center_x /= num_neighbors
+            center_y /= num_neighbors
+            direction = np.array([center_x, center_y]) - self.position
+            self.acceleration += centering_factor * direction
+
+    def avoid_others(self, boids, params):
+        min_distance = params['min_distance']
+        avoid_factor = params['avoid_factor']
+        move = np.zeros(2, dtype='float64')
+
         for other in boids:
-            distance = np.linalg.norm(other.position - self.position)
-            if other != self and distance < params['neighbor_radius']:
-                steering += other.position
-                total += 1
-        if total > 0:
-            steering /= total
-            steering -= self.position
-            steering = self.set_magnitude(steering, params['max_speed'])
-            steering -= self.velocity
-            steering = self.limit(steering, params['max_force'])
-        return steering
-
-    def separate(self, boids, params):
-        steering = np.zeros(2, dtype='float64')
-        total = 0
+            if other is not self and self.distance(other) < min_distance:
+                move += self.position - other.position
+
+        if np.linalg.norm(move) > 0:
+            move = move / np.linalg.norm(move) * avoid_factor
+            self.acceleration += move
+
+    def match_velocity(self, boids, params):
+        matching_factor = params['matching_factor']
+        avg_velocity = np.zeros(2, dtype='float64')
+        num_neighbors = 0
+
         for other in boids:
-            distance = np.linalg.norm(other.position - self.position)
-            if other != self and distance < params['desired_separation']:
-                diff = self.position - other.position
-                if distance > 0:
-                    diff /= distance
-                steering += diff
-                total += 1
-        if total > 0:
-            steering /= total
-            steering = self.set_magnitude(steering, params['max_speed'])
-            steering -= self.velocity
-            steering = self.limit(steering, params['max_force'])
-        return steering
-
-    def set_magnitude(self, vector, magnitude):
-        norm = np.linalg.norm(vector)
-        if norm == 0:
-            return vector
-        return (vector / norm) * magnitude
-
-    def limit(self, vector, max_value):
-        norm = np.linalg.norm(vector)
-        if norm > max_value:
-            return (vector / norm) * max_value
-        return vector
+            if other is not self and self.distance(other) < params['visual_range']:
+                avg_velocity += other.velocity
+                num_neighbors += 1
+
+        if num_neighbors > 0:
+            avg_velocity /= num_neighbors
+            self.acceleration += matching_factor * (avg_velocity - self.velocity)
+
+    def limit_speed(self, params):
+        speed = np.linalg.norm(self.velocity)
+        if speed > params['max_speed']:
+            self.velocity = (self.velocity / speed) * params['max_speed']
+
+    def distance(self, other):
+        return np.linalg.norm(self.position - other.position)
 
 # シミュレーションパラメータ
 params = {
-    'num_boids': 50,
-    'max_speed': 4.0,
-    'max_force': 0.1,
-    'neighbor_radius': 50.0,
-    'desired_separation': 25.0,
-    'align_weight': 1.0,
-    'cohesion_weight': 1.0,
-    'separation_weight': 1.5
+    'num_boids': 100,
+    'visual_range': 75.0,
+    'min_distance': 20.0,
+    'centering_factor': 0.005,
+    'avoid_factor': 0.05,
+    'matching_factor': 0.05,
+    'max_speed': 15.0,
+    'draw_trail': False,
+    'max_history': 50
 }
 
 # Streamlitのサイドバーでパラメータを調整
 st.sidebar.title("Boids Simulation Parameters")
-params['num_boids'] = st.sidebar.slider("Number of Boids", 10, 200, 50)
-params['max_speed'] = st.sidebar.slider("Max Speed", 1.0, 10.0, 4.0)
-params['max_force'] = st.sidebar.slider("Max Force", 0.01, 1.0, 0.1)
-params['neighbor_radius'] = st.sidebar.slider("Neighbor Radius", 10.0, 100.0, 50.0)
-params['desired_separation'] = st.sidebar.slider("Desired Separation", 5.0, 50.0, 25.0)
-params['align_weight'] = st.sidebar.slider("Alignment Weight", 0.0, 5.0, 1.0)
-params['cohesion_weight'] = st.sidebar.slider("Cohesion Weight", 0.0, 5.0, 1.0)
-params['separation_weight'] = st.sidebar.slider("Separation Weight", 0.0, 5.0, 1.5)
+params['num_boids'] = st.sidebar.slider("Number of Boids", 10, 300, 100)
+params['visual_range'] = st.sidebar.slider("Visual Range", 10.0, 200.0, 75.0)
+params['min_distance'] = st.sidebar.slider("Minimum Separation Distance", 5.0, 100.0, 20.0)
+params['centering_factor'] = st.sidebar.slider("Centering Factor", 0.001, 0.02, 0.005)
+params['avoid_factor'] = st.sidebar.slider("Avoidance Factor", 0.01, 0.1, 0.05)
+params['matching_factor'] = st.sidebar.slider("Matching Factor", 0.01, 0.1, 0.05)
+params['max_speed'] = st.sidebar.slider("Maximum Speed", 5.0, 30.0, 15.0)
+params['draw_trail'] = st.sidebar.checkbox("Draw Trails")
+if params['draw_trail']:
+    params['max_history'] = st.sidebar.slider("Trail Length", 10, 100, 50)
 
 # シミュレーション画面サイズ
 width, height = 800, 600
@@ -134,28 +133,41 @@ fig = go.Figure(
     layout=go.Layout(
         xaxis=dict(range=[0, width], autorange=False, showgrid=False, zeroline=False),
         yaxis=dict(range=[0, height], autorange=False, showgrid=False, zeroline=False),
-        width=800,
-        height=600,
+        width=width,
+        height=height,
         margin=dict(l=0, r=0, t=0, b=0)
     )
 )
 
+# Boidsの初期位置をプロット
 scatter = go.Scatter(
     x=[boid.position[0] for boid in boids],
     y=[boid.position[1] for boid in boids],
     mode='markers',
-    marker=dict(size=10, color='blue')
+    marker=dict(size=8, color='blue')
 )
 
 fig.add_trace(scatter)
 
-# Streamlitのメインループ
-st.title("Boids Simulation with Streamlit and Plotly")
+# トレイル用のトレース
+if params['draw_trail']:
+    trail_scatter = go.Scatter(
+        x=[],
+        y=[],
+        mode='lines',
+        line=dict(color='rgba(0,0,255,0.2)', width=1),
+        showlegend=False
+    )
+    fig.add_trace(trail_scatter)
+
+# Streamlitのタイトル
+st.title("Boids Simulation")
 
+# アニメーションの表示領域
 animation_placeholder = st.empty()
 
 # アニメーションの実行
-frame_rate = st.sidebar.slider("Frame Rate (FPS)", 1, 60, 20)
+frame_rate = 30  # フレームレート (FPS)
 sleep_time = 1.0 / frame_rate
 
 # リセットボタンの追加
@@ -167,40 +179,31 @@ if st.sidebar.button("Reset Simulation"):
         velocity = [np.cos(angle), np.sin(angle)]
         boids.append(Boid(position, velocity))
 
-# アニメーションの実行
 while True:
     # Boidsの更新
     for boid in boids:
         boid.update(boids, width, height, params)
 
-    # 各Boidの向きを計算
-    angles = [np.arctan2(boid.velocity[1], boid.velocity[0]) for boid in boids]
+    # Boidsの位置データを更新
+    scatter.x = [boid.position[0] for boid in boids]
+    scatter.y = [boid.position[1] for boid in boids]
 
-    # 矢印用の線データを作成
-    arrow_x = []
-    arrow_y = []
-    arrow_u = []
-    arrow_v = []
-    for boid, angle in zip(boids, angles):
-        arrow_x.append(boid.position[0])
-        arrow_y.append(boid.position[1])
-        arrow_u.append(np.cos(angle) * 10)  # 矢印の長さ
-        arrow_v.append(np.sin(angle) * 10)
+    # トレイルの更新
+    if params['draw_trail']:
+        trail_x = []
+        trail_y = []
+        for boid in boids:
+            trail_x.extend([pos[0] for pos in boid.history])
+            trail_y.extend([pos[1] for pos in boid.history])
+        trail_scatter.x = trail_x
+        trail_scatter.y = trail_y
 
     # グラフの更新
-    fig.data[0].x = [boid.position[0] for boid in boids]
-    fig.data[0].y = [boid.position[1] for boid in boids]
-
-    # 矢印の追加
-    fig.data = fig.data[:1]  # 既存のデータをクリア
-    fig.add_trace(go.Scatter(
-        x=[x for x, u in zip(arrow_x, arrow_u)],
-        y=[y for y, v in zip(arrow_y, arrow_v)],
-        mode='markers+lines',
-        marker=dict(size=5, color='red'),
-        line=dict(width=1, color='red'),
-        showlegend=False
-    ))
+    fig.data[0].x = scatter.x
+    fig.data[0].y = scatter.y
+    if params['draw_trail']:
+        fig.data[1].x = trail_scatter.x
+        fig.data[1].y = trail_scatter.y
 
     # アニメーション表示
     animation_placeholder.plotly_chart(fig, use_container_width=True)