Update app.py

app.py

@@ -1,157 +1,209 @@
-# app.py
+# boids_streamlit_advanced.py
+
 import streamlit as st
 import numpy as np
-import plotly.graph_objs as go
-from dataclasses import dataclass
+import plotly.graph_objects as go
 import time
 
-# カスタムコンポーネントのインポート
-from my_mouse_tracker import my_mouse_tracker
-
-@dataclass
+# Boidクラスの定義
 class Boid:
-    position: np.ndarray
-    velocity: np.ndarray
+    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')
 
-def initialize_boids(num_boids, width, height, speed):
-    boids = []
-    for _ in range(num_boids):
-        position = np.array([np.random.uniform(0, width), np.random.uniform(0, height)])
-        angle = np.random.uniform(0, 2*np.pi)
-        velocity = np.array([np.cos(angle), np.sin(angle)]) * speed
-        boids.append(Boid(position, velocity))
-    return boids
+    def update(self, boids, width, height, params):
+        self.flock(boids, params)
+        self.velocity += self.acceleration
+        speed = np.linalg.norm(self.velocity)
+        if speed > params['max_speed']:
+            self.velocity = (self.velocity / speed) * params['max_speed']
+        self.position += self.velocity
+        self.acceleration = np.zeros(2, dtype='float64')
 
-def update_boids(boids, width, height, alignment_factor, cohesion_factor, separation_factor,
-                perception_radius, max_speed, mouse_pos=None, mouse_influence=0.05):
-    new_boids = []
-    for boid in boids:
-        alignment = np.zeros(2)
-        cohesion = np.zeros(2)
-        separation = np.zeros(2)
+        # 画面端でのラッピング
+        self.position[0] = self.position[0] % width
+        self.position[1] = self.position[1] % height
+
+    def flock(self, boids, params):
+        alignment = self.align(boids, params)
+        cohesion = self.cohere(boids, params)
+        separation = self.separate(boids, params)
+
+        self.acceleration += alignment * params['align_weight']
+        self.acceleration += cohesion * params['cohesion_weight']
+        self.acceleration += separation * params['separation_weight']
+
+    def align(self, boids, params):
+        steering = np.zeros(2, dtype='float64')
         total = 0
         for other in boids:
-            distance = np.linalg.norm(other.position - boid.position)
-            if other != boid and distance < perception_radius:
-                alignment += other.velocity
-                cohesion += other.position
-                separation += (boid.position - other.position) / distance
+            distance = np.linalg.norm(other.position - self.position)
+            if other != self and distance < params['neighbor_radius']:
+                steering += other.velocity
                 total += 1
         if total > 0:
-            alignment = (alignment / total) * alignment_factor
-            cohesion = ((cohesion / total) - boid.position) * cohesion_factor
-            separation = (separation / total) * separation_factor
-            boid.velocity += alignment + cohesion + separation
-            # マウスの影響
-            if mouse_pos is not None:
-                direction_to_mouse = mouse_pos - boid.position
-                distance_to_mouse = np.linalg.norm(direction_to_mouse)
-                if distance_to_mouse < perception_radius:
-                    # 避ける動作
-                    boid.velocity -= (direction_to_mouse / distance_to_mouse) * mouse_influence
-            # 速度の制限
-            speed = np.linalg.norm(boid.velocity)
-            if speed > max_speed:
-                boid.velocity = (boid.velocity / speed) * max_speed
-        # 位置の更新
-        boid.position += boid.velocity
-        # 境界条件（トーラス型）
-        boid.position[0] %= width
-        boid.position[1] %= height
-        new_boids.append(boid)
-    return new_boids
-
-def plot_boids(boids, width, height, mouse_pos=None):
-    x = [boid.position[0] for boid in boids]
-    y = [boid.position[1] for boid in boids]
-    trace = go.Scatter(
-        x=x,
-        y=y,
-        mode='markers',
-        marker=dict(size=8, color='blue'),
-    )
-    layout = go.Layout(
-        xaxis=dict(range=[0, width], autorange=False, zeroline=False, showgrid=False),
-        yaxis=dict(range=[0, height], autorange=False, zeroline=False, showgrid=False),
-        margin=dict(l=0, r=0, t=0, b=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
+        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
+        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
+
+# シミュレーションパラメータ
+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
+}
+
+# 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)
+
+# シミュレーション画面サイズ
+width, height = 800, 600
+
+# Boidsの初期化
+boids = []
+for _ in range(params['num_boids']):
+    position = [np.random.uniform(0, width), np.random.uniform(0, height)]
+    angle = np.random.uniform(0, 2 * np.pi)
+    velocity = [np.cos(angle), np.sin(angle)]
+    boids.append(Boid(position, velocity))
+
+# Plotlyのグラフ設定
+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=600,
-        shapes=[],
+        margin=dict(l=0, r=0, t=0, b=0)
     )
-    # マウス位置の表示
-    if mouse_pos is not None:
-        layout['shapes'] = [
-            dict(
-                type="circle",
-                xref="x",
-                yref="y",
-                x0=mouse_pos[0]-10,
-                y0=mouse_pos[1]-10,
-                x1=mouse_pos[0]+10,
-                y1=mouse_pos[1]+10,
-                line=dict(color="red"),
-            )
-        ]
-    fig = go.Figure(data=[trace], layout=layout)
-    return fig
-
-def main():
-    st.set_page_config(page_title="Boidsシミュレーション", layout="wide")
-    st.title("インタラクティブBoidsシミュレーション")
-    st.markdown("マウスの位置に反応する魚の群れをシミュレートします。")
-
-    # サイドバーのパラメータ設定
-    st.sidebar.header("パラメータ設定")
-    num_boids = st.sidebar.slider("ボイドの数", 10, 500, 100)
-    width = st.sidebar.slider("キャンバスの幅", 300, 1200, 800)
-    height = st.sidebar.slider("キャンバスの高さ", 300, 1200, 800)
-    speed = st.sidebar.slider("初期速度", 0.5, 5.0, 2.0)
-    alignment_factor = st.sidebar.slider("整列係数", 0.0, 2.0, 1.0)
-    cohesion_factor = st.sidebar.slider("結合係数", 0.0, 2.0, 1.0)
-    separation_factor = st.sidebar.slider("分離係数", 0.0, 2.0, 1.5)
-    perception_radius = st.sidebar.slider("認識半径", 10, 200, 50)
-    max_speed = st.sidebar.slider("最大速度", 1.0, 10.0, 4.0)
-    simulation_speed = st.sidebar.slider("シミュレーション速度（秒）", 0.01, 1.0, 0.1)
-    mouse_influence = st.sidebar.slider("マウスの影響力", 0.0, 1.0, 0.05)
-
-    # マウス位置の取得
-    mouse_event = my_mouse_tracker()
-    if mouse_event:
-        mouse_x, mouse_y = mouse_event['x'], mouse_event['y']
-        # キャンバスの座標にマッピング（必要に応じて調整）
-        mouse_pos = np.array([mouse_x, mouse_y])
-    else:
-        mouse_pos = None
-
-    # セッションステートの初期化
-    if 'boids' not in st.session_state:
-        st.session_state.boids = initialize_boids(num_boids, width, height, speed)
-        st.session_state.last_update = time.time()
-
-    # パラメータの変更時にボイドを再初期化
-    current_params = (num_boids, width, height, speed)
-    if st.session_state.get('params', None) != current_params:
-        st.session_state.boids = initialize_boids(num_boids, width, height, speed)
-        st.session_state.last_update = time.time()
-        st.session_state.params = current_params
-
-    # シミュレーションの更新
-    current_time = time.time()
-    if current_time - st.session_state.last_update > simulation_speed:
-        st.session_state.boids = update_boids(
-            st.session_state.boids, width, height,
-            alignment_factor, cohesion_factor,
-            separation_factor, perception_radius,
-            max_speed, mouse_pos, mouse_influence
-        )
-        st.session_state.last_update = current_time
-
-    # ビジュアライゼーションの表示
-    fig = plot_boids(st.session_state.boids, width, height, mouse_pos)
-    st.plotly_chart(fig, use_container_width=True)
-
-    # 自動リロードの代替
-    # st.experimental_rerun() を削除し、Streamlitの再実行機能に任せる
-
-if __name__ == "__main__":
-    main()
+)
+
+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')
+)
+
+fig.add_trace(scatter)
+
+# Streamlitのメインループ
+st.title("Boids Simulation with Streamlit and Plotly")
+
+animation_placeholder = st.empty()
+
+# アニメーションの実行
+frame_rate = st.sidebar.slider("Frame Rate (FPS)", 1, 60, 20)
+sleep_time = 1.0 / frame_rate
+
+# リセットボタンの追加
+if st.sidebar.button("Reset Simulation"):
+    boids = []
+    for _ in range(params['num_boids']):
+        position = [np.random.uniform(0, width), np.random.uniform(0, height)]
+        angle = np.random.uniform(0, 2 * np.pi)
+        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]
+
+    # 矢印用の線データを作成
+    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)
+
+    # グラフの更新
+    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
+    ))
+
+    # アニメーション表示
+    animation_placeholder.plotly_chart(fig, use_container_width=True)
+
+    # フレームレート調整
+    time.sleep(sleep_time)