Update app.py

app.py

@@ -3,22 +3,19 @@ import gradio as gr
 import numpy as np
 import random
 from PIL import Image, ImageDraw
-import math
 
 # ============== НАСТРОЙКИ ==============
 WORLD_SIZE = 30
 CELL_SIZE = 12
 MAX_CREATURES = 30
 
-# ============== ПРОСТАЯ НЕЙРОСЕТЬ (без PyTorch) ==============
+# ============== ПРОСТАЯ НЕЙРОСЕТЬ ==============
 class SimpleBrain:
     def __init__(self):
-        # Простая матрица весов
         self.weights = np.random.randn(8, 5) * 0.5
         self.bias = np.random.randn(5) * 0.5
     
     def forward(self, inputs):
-        # Простой перцептрон
         x = np.array(inputs)
         output = np.tanh(np.dot(x, self.weights) + self.bias)
         return output
@@ -29,20 +26,19 @@ class SimpleBrain:
         new_brain.bias = self.bias.copy()
         return new_brain
     
-    def mutate(self, rate=0.2, scale=0.3):
-        if random.random() < rate:
-            self.weights += np.random.randn(*self.weights.shape) * scale
-        if random.random() < rate:
-            self.bias += np.random.randn(*self.bias.shape) * scale
+    def mutate(self):
+        if random.random() < 0.2:
+            self.weights += np.random.randn(*self.weights.shape) * 0.3
+        if random.random() < 0.2:
+            self.bias += np.random.randn(*self.bias.shape) * 0.3
 
 # ============== СУЩЕСТВО ==============
 class Creature:
-    def __init__(self, x, y, color, team, brain=None):
+    def __init__(self, x, y, color, team):
         self.x = x
         self.y = y
         self.color = color
         self.team = team
-        
         self.health = 100
         self.energy = 80
         self.food = 50
@@ -51,18 +47,16 @@ class Creature:
         self.age = 0
         self.alive = True
         self.fitness = 0
-        self.children = 0
-        
-        self.brain = brain if brain else SimpleBrain()
+        self.brain = SimpleBrain()
     
     def think(self, world, creatures):
-        # Собираем входные данные
+        # Входные данные
         hunger = 1.0 - self.food / 100.0
         thirst = 1.0 - self.water / 100.0
         health = self.health / 100.0
         energy = self.energy / 100.0
         
-        # Смотрим вокруг
+        # Обзор
         nearby = []
         for dx in [-1, 0, 1]:
             for dy in [-1, 0, 1]:
@@ -82,7 +76,7 @@ class Creature:
                 else:
                     nearby.append(0.0)
         
-        # Ищем врагов и друзей
+        # Друзья и враги
         partners = 0
         enemies = 0
         for other in creatures:
@@ -95,21 +89,18 @@ class Creature:
                 else:
                     enemies = max(enemies, 1.0 - dist/3.0)
         
-        # Входные данные (8 признаков)
         inputs = [hunger, thirst, health, energy, partners, enemies]
-        inputs.extend(nearby[:4])  # берем первые 4 направления
+        inputs.extend(nearby[:4])
         
-        # Прогоняем через нейросеть
         output = self.brain.forward(inputs)
         
-        # Декодируем действия
+        # Действия
         dx = int(round(output[0] * 2))
         dy = int(round(output[1] * 2))
         build = output[2] > 0.3
         reproduce = output[3] > 0.5
         attack = output[4] > 0.4
         
-        # Выполняем действия
         self.move(dx, dy)
         
         if build and self.resources >= 2:
@@ -147,7 +138,6 @@ class Creature:
         if len(creatures) >= MAX_CREATURES:
             return None
         
-        # Создаем ребенка
         child_brain = self.brain.copy()
         child_brain.mutate()
         
@@ -155,16 +145,15 @@ class Creature:
             self.x + random.randint(-2, 2),
             self.y + random.randint(-2, 2),
             self.color,
-            self.team,
-            child_brain
+            self.team
         )
+        child.brain = child_brain
         child.food = 30
         child.water = 30
         child.energy = 40
         
         self.food -= 30
         self.energy -= 20
-        self.children += 1
         self.fitness += 25
         
         creatures.append(child)
@@ -239,7 +228,7 @@ class Creature:
         
         return True
 
-# ============== СОЗДАНИЕ МИРА ==============
+# ============== МИР ==============
 def create_world():
     world = np.zeros((WORLD_SIZE, WORLD_SIZE, 3), dtype=np.uint8)
     world[:, :] = [100, 200, 100]
@@ -273,24 +262,14 @@ def create_world():
                 world[x, y] = [0, 100, 255]
                 break
     
-    # Существа
     creatures = []
-    
-    # Красный вид
-    c1 = Creature(5, 5, [255, 50, 50], "red")
-    creatures.append(c1)
-    
-    # Синий вид
-    c2 = Creature(25, 25, [50, 50, 255], "blue")
-    creatures.append(c2)
-    
-    # Золотой вид
-    c3 = Creature(15, 15, [255, 215, 0], "gold")
-    creatures.append(c3)
+    creatures.append(Creature(5, 5, [255, 50, 50], "red"))
+    creatures.append(Creature(25, 25, [50, 50, 255], "blue"))
+    creatures.append(Creature(15, 15, [255, 215, 0], "gold"))
     
     return world, creatures
 
-# ============== ШАГ СИМУЛЯЦИИ ==============
+# ============== СИМУЛЯЦИЯ ==============
 def simulate_step(world, creatures, step):
     new_creatures = []
     
@@ -313,7 +292,6 @@ def simulate_step(world, creatures, step):
     creatures.extend(new_creatures)
     creatures = [c for c in creatures if c.alive]
     
-    # Восстановление ресурсов
     if step % 5 == 0:
         for _ in range(2):
             for _ in range(20):
@@ -322,7 +300,6 @@ def simulate_step(world, creatures, 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:]:
@@ -333,36 +310,29 @@ def simulate_step(world, creatures, step):
 
 # ============== ОТРИСОВКА ==============
 def render_world(world, creatures, step):
-    img = Image.new('RGB', (WORLD_SIZE * CELL_SIZE, WORLD_SIZE * CELL_SIZE + 80), (30, 30, 30))
+    img = Image.new('RGB', (WORLD_SIZE * 12, WORLD_SIZE * 12 + 80), (30, 30, 30))
     draw = ImageDraw.Draw(img)
     
-    # Мир
     for i in range(WORLD_SIZE):
         for j in range(WORLD_SIZE):
-            x, y = i * CELL_SIZE, j * CELL_SIZE
-            color = tuple(world[i, j].tolist())
-            draw.rectangle([x, y, x + CELL_SIZE, y + CELL_SIZE], fill=color)
+            x, y = i * 12, j * 12
+            draw.rectangle([x, y, x + 12, y + 12], fill=tuple(world[i, j].tolist()))
     
-    # Существа
     for creature in creatures:
         if not creature.alive:
             continue
-        x, y = creature.x * CELL_SIZE, creature.y * CELL_SIZE
-        color = tuple(creature.color)
-        draw.ellipse([x+1, y+1, x+CELL_SIZE-1, y+CELL_SIZE-1], 
-                    fill=color, outline=(255,255,255))
+        x, y = creature.x * 12, creature.y * 12
+        draw.ellipse([x+1, y+1, x+11, y+11], fill=tuple(creature.color), outline=(255,255,255))
         
-        # Индикаторы
-        hw = int((creature.health / 100) * CELL_SIZE)
-        fw = int((creature.food / 100) * CELL_SIZE)
-        ww = int((creature.water / 100) * CELL_SIZE)
+        hw = int((creature.health / 100) * 12)
+        fw = int((creature.food / 100) * 12)
+        ww = int((creature.water / 100) * 12)
         
         draw.rectangle([x, y-6, x + hw, y-4], fill=(255, 0, 0))
         draw.rectangle([x, y-4, x + fw, y-2], fill=(255, 165, 0))
         draw.rectangle([x, y-2, x + ww, y], fill=(0, 200, 255))
     
-    # Статистика
-    y_offset = WORLD_SIZE * CELL_SIZE + 10
+    y_offset = WORLD_SIZE * 12 + 10
     
     red = sum(1 for c in creatures if c.alive and c.team == "red")
     blue = sum(1 for c in creatures if c.alive and c.team == "blue")
@@ -375,16 +345,16 @@ def render_world(world, creatures, step):
     stones = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
                  if world[i, j][0] == 128 and world[i, j][1] == 128 and world[i, j][2] == 128)
     
-    best_fitness = max([c.fitness for c in creatures if c.alive] + [0])
+    best = max([c.fitness for c in creatures if c.alive] + [0])
     
-    draw.text([10, y_offset], f"Шаг: {step} | Существ: {len(creatures)}", fill=(255,255,255))
+    draw.text([10, y_offset], f"Шаг:{step} | Существ:{len(creatures)}", fill=(255,255,255))
     draw.text([10, y_offset + 20], f"🔴:{red}  🔵:{blue}  🟡:{gold}", fill=(255,255,255))
     draw.text([10, y_offset + 40], f"🌳:{trees}  🫐:{foods}  🪨:{stones}", fill=(255,255,255))
-    draw.text([10, y_offset + 60], f"⭐ Лучший фитнес: {best_fitness:.0f}", fill=(255,255,255))
+    draw.text([10, y_offset + 60], f"⭐ Лучший:{best}", fill=(255,255,255))
     
     return img
 
-# ============== GRADIO ФУНКЦИИ ==============
+# ============== GRADIO ==============
 world, creatures = create_world()
 step_counter = 0
 
@@ -412,10 +382,9 @@ def run_simulation(steps):
                 if world[i, j][0] == 0 and world[i, j][1] == 150 and world[i, j][2] == 0)
     stones = sum(1 for i in range(WORLD_SIZE) for j in range(WORLD_SIZE) 
                  if world[i, j][0] == 128 and world[i, j][1] == 128 and world[i, j][2] == 128)
+    best = max([c.fitness for c in creatures if c.alive] + [0])
     
-    best_fitness = max([c.fitness for c in creatures if c.alive] + [0])
-    
-    stats_text = f"""📊 СТАТИСТИКА
+    stats = f"""СТАТИСТИКА
 
 Шаг: {step_counter}
 Существ: {len(creatures)}
@@ -428,47 +397,33 @@ def run_simulation(steps):
 🫐 Ягод: {foods}
 🪨 Камней: {stones}
 
-⭐ Лучший фитнес: {best_fitness:.0f}"""
+⭐ Лучший фитнес: {best}"""
     
-    return images, stats_text
+    return images, stats
 
 def reset_simulation():
     global world, creatures, step_counter
     world, creatures = create_world()
     step_counter = 0
     img = render_world(world, creatures, 0)
-    return [img], "Мир сброшен! Нажмите 'Запустить'"
+    return [img], "Мир сброшен"
 
 # ============== ИНТЕРФЕЙС ==============
-with gr.Blocks(title="🧬 Эволюция") as demo:
-    gr.Markdown("""
-    # 🧬 Эволюционная симуляция
-    
-    🔴 Красные  |  🔵 Синие  |  🟡 Золотые
-    
-    Существа **едят**, **пьют**, **строят**, **воюют** и **размножаются**!
-    """)
+with gr.Blocks() as demo:
+    gr.Markdown("# 🧬 Эволюционная симуляция")
+    gr.Markdown("🔴 Красные | 🔵 Синие | 🟡 Золотые")
     
     with gr.Row():
         gallery = gr.Gallery(label="Мир", columns=1, rows=1, height=500)
-        stats = gr.Textbox(label="Статистика", lines=20, interactive=False)
+        stats = gr.Textbox(label="Статистика", lines=15)
     
     with gr.Row():
-        steps = gr.Slider(label="Шагов", minimum=5, maximum=50, value=20, step=5)
-        run_btn = gr.Button("▶️ Запустить", variant="primary")
-        reset_btn = gr.Button("🔄 Сбросить", variant="secondary")
-    
-    run_btn.click(
-        run_simulation,
-        inputs=[steps],
-        outputs=[gallery, stats]
-    )
-    
-    reset_btn.click(
-        reset_simulation,
-        outputs=[gallery, stats]
-    )
+        steps = gr.Slider(minimum=5, maximum=50, value=20, step=5, label="Шагов")
+        run_btn = gr.Button("▶️ Запустить")
+        reset_btn = gr.Button("🔄 Сбросить")
+    
+    run_btn.click(run_simulation, inputs=[steps], outputs=[gallery, stats])
+    reset_btn.click(reset_simulation, outputs=[gallery, stats])
 
-# ============== ЗАПУСК ==============
 if __name__ == "__main__":
-    demo.launch(share=True)
+    demo.launch(share=False)