Update app.py

app.py

@@ -5,7 +5,7 @@ import random
 import numpy as np
 from PIL import Image, ImageDraw
 import io
-import base64
+import json
 from urllib.parse import parse_qs, urlparse
 import threading
 import time
@@ -15,12 +15,13 @@ WORLD_SIZE = 40
 CELL_SIZE = 10
 MAX_CREATURES = 50
 PORT = 7890
-UPDATE_INTERVAL = 0.3  # секунд между обновлениями
+UPDATE_INTERVAL = 0.3
 
-# ============== ПРОСТАЯ НЕЙРОСЕТЬ ==============
+# ============== НЕЙРОСЕТЬ (10 входов -> 5 выходов) ==============
 class SimpleBrain:
     def __init__(self):
-        self.weights = np.random.randn(8, 5) * 0.5
+        # 10 входов (исправлено!), 5 выходов
+        self.weights = np.random.randn(10, 5) * 0.5
         self.bias = np.random.randn(5) * 0.5
     
     def forward(self, inputs):
@@ -36,9 +37,9 @@ class SimpleBrain:
     
     def mutate(self):
         if random.random() < 0.2:
-            self.weights += np.random.randn(*self.weights.shape) * 0.3
+            self.weights += np.random.randn(10, 5) * 0.3
         if random.random() < 0.2:
-            self.bias += np.random.randn(*self.bias.shape) * 0.3
+            self.bias += np.random.randn(5) * 0.3
 
 # ============== СУЩЕСТВО ==============
 class Creature:
@@ -58,30 +59,30 @@ class Creature:
         self.brain = SimpleBrain()
     
     def think(self, world, creatures):
+        # ---- ВХОДНЫЕ ДАННЫЕ (10 штук) ----
         hunger = 1.0 - self.food / 100.0
         thirst = 1.0 - self.water / 100.0
         health = self.health / 100.0
         energy = self.energy / 100.0
         
+        # Смотрим вокруг (4 направления: вверх, вниз, влево, вправо)
         nearby = []
-        for dx in [-1, 0, 1]:
-            for dy in [-1, 0, 1]:
-                if dx == 0 and dy == 0:
-                    continue
-                nx, ny = self.x + dx, self.y + dy
-                if 0 <= nx < WORLD_SIZE and 0 <= ny < WORLD_SIZE:
-                    cell = world[nx, ny]
-                    if cell[0] == 34 and cell[1] == 139 and cell[2] == 34:
-                        nearby.append(1.0)
-                    elif cell[0] == 0 and cell[1] == 150 and cell[2] == 0:
-                        nearby.append(2.0)
-                    elif cell[0] == 128 and cell[1] == 128 and cell[2] == 128:
-                        nearby.append(0.5)
-                    else:
-                        nearby.append(0.0)
+        for dx, dy in [(0, -1), (0, 1), (-1, 0), (1, 0)]:
+            nx, ny = self.x + dx, self.y + dy
+            if 0 <= nx < WORLD_SIZE and 0 <= ny < WORLD_SIZE:
+                cell = world[nx, ny]
+                if cell[0] == 34 and cell[1] == 139 and cell[2] == 34:   # дерево
+                    nearby.append(1.0)
+                elif cell[0] == 0 and cell[1] == 150 and cell[2] == 0:   # ягоды
+                    nearby.append(2.0)
+                elif cell[0] == 128 and cell[1] == 128 and cell[2] == 128: # камень
+                    nearby.append(0.5)
                 else:
                     nearby.append(0.0)
+            else:
+                nearby.append(0.0)
         
+        # Свои и враги
         partners = 0
         enemies = 0
         for other in creatures:
@@ -94,11 +95,24 @@ class Creature:
                 else:
                     enemies = max(enemies, 1.0 - dist/3.0)
         
-        inputs = [hunger, thirst, health, energy, partners, enemies]
-        inputs.extend(nearby[:4])
+        # Собираем 10 входов
+        inputs = [
+            hunger,      # 1
+            thirst,      # 2
+            health,      # 3
+            energy,      # 4
+            partners,    # 5
+            enemies,     # 6
+            nearby[0] if len(nearby) > 0 else 0.0,  # 7 - вверх
+            nearby[1] if len(nearby) > 1 else 0.0,  # 8 - вниз
+            nearby[2] if len(nearby) > 2 else 0.0,  # 9 - влево
+            nearby[3] if len(nearby) > 3 else 0.0   # 10 - вправо
+        ]
         
+        # ---- ПРЯМОЙ ПРОХОД ----
         output = self.brain.forward(inputs)
         
+        # ---- ДЕЙСТВИЯ ----
         dx = int(round(output[0] * 2))
         dy = int(round(output[1] * 2))
         build = output[2] > 0.3
@@ -237,6 +251,7 @@ def create_world():
     world = np.zeros((WORLD_SIZE, WORLD_SIZE, 3), dtype=np.uint8)
     world[:, :] = [100, 200, 100]
     
+    # Деревья
     for _ in range(20):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
@@ -244,6 +259,7 @@ def create_world():
                 world[x, y] = [34, 139, 34]
                 break
     
+    # Ягоды (еда)
     for _ in range(15):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
@@ -251,6 +267,7 @@ def create_world():
                 world[x, y] = [0, 150, 0]
                 break
     
+    # Камни
     for _ in range(10):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
@@ -258,6 +275,7 @@ def create_world():
                 world[x, y] = [128, 128, 128]
                 break
     
+    # Вода
     for _ in range(5):
         for _ in range(30):
             x, y = random.randint(0, WORLD_SIZE-1), random.randint(0, WORLD_SIZE-1)
@@ -266,13 +284,13 @@ def create_world():
                 break
     
     creatures = []
-    # Красные (верхний левый угол)
+    # Красные
     for i in range(3):
         creatures.append(Creature(5 + i*2, 5 + i*2, [255, 50, 50], "red"))
-    # Синие (нижний правый угол)
+    # Синие
     for i in range(3):
         creatures.append(Creature(WORLD_SIZE-5 - i*2, WORLD_SIZE-5 - i*2, [50, 50, 255], "blue"))
-    # Золотые (центр)
+    # Золотые
     for i in range(2):
         creatures.append(Creature(WORLD_SIZE//2 + i*2, WORLD_SIZE//2 + i*2, [255, 215, 0], "gold"))
     
@@ -282,7 +300,7 @@ def create_world():
 world, creatures = create_world()
 step_counter = 0
 
-# ============== ФУНКЦИИ СИМУЛЯЦИИ ==============
+# ============== СИМУЛЯЦИЯ ==============
 def simulate_step():
     global world, creatures, step_counter
     
@@ -307,6 +325,7 @@ def simulate_step():
     creatures.extend(new_creatures)
     creatures = [c for c in creatures if c.alive]
     
+    # Восстановление ягод
     if step_counter % 5 == 0:
         for _ in range(2):
             for _ in range(20):
@@ -315,6 +334,7 @@ def simulate_step():
                     world[x, y] = [0, 150, 0]
                     break
     
+    # Отбор
     if len(creatures) > MAX_CREATURES:
         creatures.sort(key=lambda c: c.fitness, reverse=True)
         for c in creatures[MAX_CREATURES:]:
@@ -324,7 +344,6 @@ def simulate_step():
     step_counter += 1
 
 def render_world():
-    # Размер изображения подстраивается под окно
     img = Image.new('RGB', (WORLD_SIZE * 12, WORLD_SIZE * 12 + 60), (30, 30, 30))
     draw = ImageDraw.Draw(img)
     
@@ -371,8 +390,12 @@ def render_world():
 # ============== ПОТОК СИМУЛЯЦИИ ==============
 def simulation_loop():
     while True:
-        simulate_step()
-        time.sleep(UPDATE_INTERVAL)
+        try:
+            simulate_step()
+            time.sleep(UPDATE_INTERVAL)
+        except Exception as e:
+            print(f"Ошибка в симуляции: {e}")
+            time.sleep(1)
 
 # ============== HTTP СЕРВЕР ==============
 HTML_TEMPLATE = """
@@ -543,16 +566,14 @@ HTML_TEMPLATE = """
             updateStats();
         }
         
-        // Обновляем каждые 300ms
         setInterval(update, 300);
-        
-        // Первое обновление
         update();
     </script>
 </body>
 </html>
 """
 
+# ============== HTTP ОБРАБОТЧИК ==============
 class SimulationHandler(http.server.BaseHTTPRequestHandler):
     def do_GET(self):
         parsed = urlparse(self.path)
@@ -616,7 +637,7 @@ class SimulationHandler(http.server.BaseHTTPRequestHandler):
 
 # ============== ЗАПУСК ==============
 if __name__ == '__main__':
-    # Запускаем симуляцию в отдельном потоке
+    # Запускаем симуляцию в потоке
     sim_thread = threading.Thread(target=simulation_loop, daemon=True)
     sim_thread.start()