resolve confilict

Author: fangchenli

openevolve/config.py

@@ -486,9 +486,18 @@ class Config:
     @classmethod
     def from_yaml(cls, path: Union[str, Path]) -> "Config":
         """Load configuration from a YAML file"""
-        with open(path, "r") as f:
+        config_path = Path(path).resolve()
+        with open(config_path, "r") as f:
             config_dict = yaml.safe_load(f)
-        return cls.from_dict(config_dict)
+        config = cls.from_dict(config_dict)
+
+        # Resolve template_dir relative to config file location
+        if config.prompt.template_dir:
+            template_path = Path(config.prompt.template_dir)
+            if not template_path.is_absolute():
+                config.prompt.template_dir = str((config_path.parent / template_path).resolve())
+
+        return config
 
     @classmethod
     def from_dict(cls, config_dict: Dict[str, Any]) -> "Config":

openevolve/process_parallel.py

@@ -39,6 +39,7 @@ class SerializableResult:
     iteration: int = 0
     error: Optional[str] = None
     template_id: Optional[str] = None  # For prompt meta-evolution tracking
+    target_island: Optional[int] = None  # Island where child should be placed
 
 
 def _worker_init(config_dict: dict, evaluation_file: str, parent_env: dict = None) -> None:
@@ -335,6 +336,8 @@ def _run_iteration_worker(
 
         # Extract template_id for meta-evolution tracking (if present)
         template_id = prompt.get("template_id") if prompt else None
+        # Get target island from snapshot (where child should be placed)
+        target_island = db_snapshot.get("sampling_island")
 
         return SerializableResult(
             child_program_dict=child_program.to_dict(),
@@ -345,6 +348,7 @@ def _run_iteration_worker(
             artifacts=artifacts,
             iteration=iteration,
             template_id=template_id,
+            target_island=target_island,
         )
 
     except Exception as e:
@@ -588,9 +592,14 @@ async def run_evolution(
                     # Reconstruct program from dict
                     child_program = Program(**result.child_program_dict)
 
-                    # Add to database (will auto-inherit parent's island)
-                    # No need to specify target_island - database will handle parent island inheritance
-                    self.database.add(child_program, iteration=completed_iteration)
+                    # Add to database with explicit target_island to ensure proper island placement
+                    # This fixes issue #391: children should go to the target island, not inherit
+                    # from the parent (which may be from a different island due to fallback sampling)
+                    self.database.add(
+                        child_program,
+                        iteration=completed_iteration,
+                        target_island=result.target_island,
+                    )
 
                     # Store artifacts
                     if result.artifacts:

openevolve/prompt/meta_evolution.py

@@ -256,7 +256,9 @@ def sample_template(self) -> PromptTemplate:
         templates = list(self.templates.values())
         weights = []
         for t in templates:
-            # Score-based weight with exploration bonus for under-used templates
+            # Exploration bonus for under-used templates: linearly decreases from 0.3 to 0
+            # as uses increase from 0 to 20. This ensures new templates get enough trials
+            # before being judged solely on their score.
             exploration_bonus = max(0, 1.0 - t.uses / 20) * 0.3
             weights.append(self.get_template_score(t) + exploration_bonus)
 
@@ -361,6 +363,12 @@ def to_dict(self) -> Dict[str, Any]:
             "min_uses_for_evolution": self.min_uses_for_evolution,
             "elite_fraction": self.elite_fraction,
             "exploration_rate": self.exploration_rate,
+            # Scoring configuration
+            "score_weight_success": self.score_weight_success,
+            "score_weight_improvement": self.score_weight_improvement,
+            "score_weight_fitness_delta": self.score_weight_fitness_delta,
+            "score_min_uses": self.score_min_uses,
+            "score_neutral_prior": self.score_neutral_prior,
             "default_template_id": self.default_template_id,
             "templates": {tid: t.to_dict() for tid, t in self.templates.items()},
         }
@@ -373,6 +381,12 @@ def from_dict(cls, data: Dict[str, Any]) -> "PromptArchive":
             min_uses_for_evolution=data.get("min_uses_for_evolution", 10),
             elite_fraction=data.get("elite_fraction", 0.3),
             exploration_rate=data.get("exploration_rate", 0.2),
+            # Scoring configuration
+            score_weight_success=data.get("score_weight_success", 0.3),
+            score_weight_improvement=data.get("score_weight_improvement", 0.4),
+            score_weight_fitness_delta=data.get("score_weight_fitness_delta", 0.3),
+            score_min_uses=data.get("score_min_uses", 5),
+            score_neutral_prior=data.get("score_neutral_prior", 0.5),
         )
         archive.default_template_id = data.get("default_template_id")
 

openevolve/prompt/templates.py

@@ -4,9 +4,12 @@
 
 import os
 import json
+import logging
 from pathlib import Path
 from typing import Dict, List, Optional, Union, Any
 
+logger = logging.getLogger(__name__)
+
 # Base system message template for evolution
 BASE_SYSTEM_TEMPLATE = """You are an expert software developer tasked with iteratively improving a codebase.
 Your job is to analyze the current program and suggest improvements based on feedback from previous attempts.
@@ -185,8 +188,13 @@ def __init__(self, custom_template_dir: Optional[str] = None):
         self._load_from_directory(self.default_dir)
 
         # 2. Override with custom templates (if provided)
-        if self.custom_dir and self.custom_dir.exists():
-            self._load_from_directory(self.custom_dir)
+        if self.custom_dir:
+            if self.custom_dir.exists():
+                self._load_from_directory(self.custom_dir)
+            else:
+                logger.warning(
+                    f"Custom template directory does not exist, using default prompt."
+                )
 
     def _load_from_directory(self, directory: Path) -> None:
         """Load all templates and fragments from a directory"""