evolib 0.2.0b4.dev9__tar.gz → 0.2.0b4.dev10__tar.gz

{evolib-0.2.0b4.dev9/evolib.egg-info → evolib-0.2.0b4.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evolib
-Version: 0.2.0b4.dev9
+Version: 0.2.0b4.dev10
 Summary: A modular framework for evolutionary strategies and neuroevolution.
 Author-email: EvoLib <evolib@dismail.de>
 License: MIT License

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/docs/config_guide.md

@@ -120,6 +120,11 @@ This configuration demonstrates EvoNet evolution: weight mutation, bias-specific
 
 `dim: [2, 0, 0, 1]` starts with empty hidden layers, letting structural mutation grow nodes and edges.
 
+Connectivity:
+- `scope` controls which feedforward edges are allowed at initialization.
+- `density` controls how many of those allowed edges are actually created at init.
+- `recurrent` enables recurrent edge kinds (empty list means none).
+
 Topology constraints:
 - `max_neurons` and `max_connections` keep growth bounded (these are the current names; avoid older `max_nodes/max_edges`).
 
@@ -127,6 +132,8 @@ Delay:
 - `delay:` initializes delays of recurrent connections at build time.
 - `mutation.delay:` mutates delays during evolution (recurrent connections only).
 
+
+
 ```yaml
 parent_pool_size: 20
 offspring_pool_size: 40
@@ -145,17 +152,22 @@ modules:
     type: evonet
     dim: [2, 0, 0, 1]       # hidden layers start empty
     activation: [linear, tanh, tanh, sigmoid]
+
+    connectivity:
+      scope: crosslayer          # adjacent | crosslayer
+      density: 1.0               # (0, 1]
+      recurrent: [direct]        # [], [direct], [lateral], [indirect]
+    
     weights:
       initializer: normal
       std: 0.5
       bounds: [-5.0, 5.0]
+    
     bias:      
       initializer: normal
       std: 0.5
       bounds: [-1.0, 1.0]
 
-    recurrent: direct   # REQUIRED for delay to have any effect
-
     # NOTE: Delays only apply to recurrent connections.
     # If `recurrent` is not enabled, this block has no effect.
     delay:

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/docs/config_parameter.md

@@ -289,12 +289,30 @@ modules:
 | `dim`             | list[int]           | —       | Layer sizes, e.g. `[4, 0, 0, 2]`. Hidden layers can start empty (0) and grow through structural mutation. |
 | `activation`      | str \| list[str]    | —       | If list: activation per layer. If str: used for non-input layers; input layer is treated as linear. |
 | `initializer`     | str                 | default | Topology preset (e.g. `default`, `unconnected`, `identity`). Parameter initialization is configured via `weights`, `bias`, and `delay`. |
+| `connectivity`    | `dict`                   | —       | **Required.** Defines feedforward scope/density and allowed recurrent kinds. |
 | `weights`         | dict                | —       | Weight init and bounds configuration (initializer, bounds, optional params). | 
 | `bias`            | dict                | —       | Bias init and bounds configuration (initializer, bounds, optional params). | 
 | `neuron_dynamics` | list[dict] \| null  | null    | Optional per-layer neuron dynamics specification. Must match `len(dim)`. |
 | `mutation`        | dict \| null        | null    | Mutation settings for weights, biases, activations, delay, and structure. |
 | `crossover`       | dict \| null        | null    | Optional crossover settings (weight/bias level). |
 
+#### Connectivity (`connectivity`)
+
+| Field       | Type                         | Default | Notes |
+|------------|------------------------------|---------|------|
+| `scope`    | `"adjacent" \| "crosslayer"` | —       | **Required.** Allowed feedforward edge scope at initialization. |
+| `density`  | `float`                      | —       | **Required.** Fraction of allowed feedforward edges created at init `(0,1]`. |
+| `recurrent`| `list[str]`                  | `[]`    | Allowed recurrent edge kinds. Empty list means none. |
+
+Example:
+
+```yaml
+connectivity:
+  scope: crosslayer
+  density: 0.5
+  recurrent: [direct]
+```
+
 ##### weights block
 |Parameter	 | Type	 | Default	 | Explanation |
 |------------|-------|-----------|-------------|
@@ -325,8 +343,8 @@ Allowed presets:
 | Initializer            | Meaning (topology only) |
 |------------------------|-------------------------|
 | `default`       | Standard EvoNet topology preset (uses `connection_scope`, `connection_density`, and `recurrent`). |
-| `unconnected_evonet`   | Creates neurons/layers but starts with **no connections** (use structural mutation to grow). |
-| `identity_evonet`      | Special preset intended for stable recurrent memory (may override parameters internally; see notes below). |
+| `unconnected`   | Creates neurons/layers but starts with **no connections** (use structural mutation to grow). |
+| `identity`      | Special preset intended for stable recurrent memory (may override parameters internally; see notes below). |
 
 ---
 
@@ -493,13 +511,12 @@ structural:
 
 ### Topology constraints
 
-| Field                | Type          | Default  | Description |
-|---------------------|---------------|----------|-------------|
-| `recurrent`          | str           | `none`   | Controls recurrence: `none`, `direct`, `local` or `all`. |
-| `connection_scope`   | str           | `adjacent` | Allowed layer connectivity: `adjacent` (neighbor layers only) or `crosslayer` (any-to-any). |
-| `connection_density` | float         | 1.0     | Fraction of possible connections initialized at creation time. |
-| `max_neurons`        | int \| null   | null     | Maximum number of non-input neurons (`null` = unlimited). |
-| `max_connections`    | int \| null   | null     | Maximum number of edges (`null` = unlimited). |
+| Field              | Type                           | Default     | Description |
+|-------------------|--------------------------------|-------------|-------------|
+| `recurrent`        | `list[str]`                    | `[]`        | Allowed recurrent kinds for `add_connection`. Empty list means none. |
+| `connection_scope` | `"adjacent" \| "crosslayer" \| null` | `"adjacent"` | Constraint for structural add-neuron / add-connection edge placement. |
+| `max_neurons`      | `int \| null`                  | `null`      | Upper bound on total neurons allowed (implementation-defined counting). |
+| `max_connections`  | `int \| null`                  | `null`      | Upper bound on total connections allowed. |
 
 ---
 
@@ -544,7 +561,6 @@ modules:
     type: evonet
     dim: [4, 0, 0, 2]
     activation: [linear, tanh, tanh, tanh]
-    initializer: normal_evonet
 
     delay:
       initializer: uniform

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/config/base_component_config.py

@@ -8,10 +8,11 @@ should be configured, not *how* it is executed. Any runtime behavior belongs
 into the respective Para* representations and operator modules.
 """
 
-from typing import Literal, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 from evonet.activation import ACTIVATIONS
-from pydantic import BaseModel, ConfigDict, Field, model_validator, validator
+from evonet.enums import RecurrentKind
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
 from evolib.interfaces.enums import (
     CrossoverOperator,
@@ -221,15 +222,21 @@ class AddNeuron(BaseModel):
         "neurons in hidden layers.",
     )
 
-    @validator("activations_allowed", each_item=True)
-    def validate_activation_name(cls, act_name: str) -> str:
+    @field_validator("activations_allowed")
+    @classmethod
+    def validate_activations_allowed(
+        cls, acts: Optional[list[str]]
+    ) -> Optional[list[str]]:
         """Ensure only valid activation function names are allowed."""
-        if act_name not in ACTIVATIONS:
-            raise ValueError(
-                f"Invalid activation function '{act_name}'. "
-                f"Valid options are: {list(ACTIVATIONS.keys())}"
-            )
-        return act_name
+        if acts is None:
+            return None
+        for a in acts:
+            if a not in ACTIVATIONS:
+                raise ValueError(
+                    f"Invalid activation function '{a}'. "
+                    f"Valid options are: {sorted(ACTIVATIONS.keys())}"
+                )
+        return acts
 
 
 class RemoveNeuron(BaseModel):
@@ -267,7 +274,12 @@ class StructuralTopology(BaseModel):
     mutation operators.
     """
 
-    recurrent: Optional[Literal["none", "direct", "local", "all"]] = "none"
+    recurrent: list[RecurrentKind] = Field(
+        default_factory=list,
+        description="Allowed recurrent edge kinds for structural "
+        "add_connection. Empty means none.",
+    )
+
     connection_scope: Optional[Literal["adjacent", "crosslayer"]] = "adjacent"
 
     max_neurons: Optional[int] = Field(
@@ -282,21 +294,34 @@ class StructuralTopology(BaseModel):
         ge=1,
     )
 
+    @field_validator("recurrent", mode="before")
+    @classmethod
+    def normalize_recurrent(cls, v: Any) -> list[RecurrentKind]:
+        """
+        Allow YAML convenience values like:
+            recurrent: none
+            recurrent: []
+        """
+        if v is None:
+            return []
+        if isinstance(v, str):
+            if v.lower() == "none":
+                return []
+            return [v]
+        return v
+
     @model_validator(mode="after")
     def _validate_topology(self) -> "StructuralTopology":
-        if self.recurrent not in {None, "none", "direct", "local", "all"}:
-            raise ValueError(f"Invalid recurrent value: {self.recurrent}")
-
         if self.connection_scope not in {None, "adjacent", "crosslayer"}:
             raise ValueError(f"Invalid connection_scope: {self.connection_scope}")
 
-        # Only positive limits allowed
         if self.max_connections is not None and self.max_connections <= 0:
             raise ValueError("max_connections must be > 0")
-
         if self.max_neurons is not None and self.max_neurons <= 0:
             raise ValueError("max_neurons must be > 0")
 
+        # ensure deterministic unique list
+        self.recurrent = sorted(set(self.recurrent), key=lambda x: x.value)
         return self
 
 

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/config/evonet_component_config.py

@@ -11,16 +11,16 @@ After parsing, raw dicts are converted into this strongly typed Pydantic model d
 config resolution.
 """
 
-from typing import Literal, Optional, Tuple, Union
+from typing import Any, Literal, Optional, Tuple, Union
 
 from evonet.activation import ACTIVATIONS
+from evonet.enums import RecurrentKind
 from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
     field_validator,
     model_validator,
-    validator,
 )
 from pydantic_core import core_schema
 
@@ -35,6 +35,55 @@ from evolib.interfaces.enums import RepresentationType
 Bounds = Tuple[float, float]
 
 
+class ConnectivityConfig(BaseModel):
+    """
+    EvoNet connectivity configuration.
+
+    recurrent:
+        Allowed recurrent edge kinds (DIRECT/LATERAL/INDIRECT).
+        If omitted, no recurrent edges are allowed.
+
+    scope:
+        adjacent  -> only adjacent-layer feedforward connections during init
+        crosslayer -> cross-layer feedforward connections during init
+
+    density:
+        Fraction of allowed feedforward edges to create at init (0 < density <= 1).
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    recurrent: list[RecurrentKind] = Field(default_factory=list)
+
+    # Required: must be explicitly set in YAML
+    scope: Literal["adjacent", "crosslayer"]
+
+    # Required: must be explicitly set in YAML
+    density: float = Field(..., gt=0.0, le=1.0)
+
+    @field_validator("recurrent", mode="before")
+    @classmethod
+    def normalize_recurrent(cls, v: Any) -> list[RecurrentKind]:
+        """
+        Allow YAML convenience values like:
+            recurrent: none
+            recurrent: []
+        """
+        if v is None:
+            return []
+        if isinstance(v, str):
+            if v.lower() == "none":
+                return []
+            return [v]
+        return v
+
+    @model_validator(mode="after")
+    def _normalize(self) -> "ConnectivityConfig":
+        # deterministic, unique
+        self.recurrent = sorted(set(self.recurrent), key=lambda x: x.value)
+        return self
+
+
 class WeightsConfig(BaseModel):
     # None means: no parameter-level initialization requested (preset may initialize).
     initializer: Optional[str] = None  # normal | uniform | zero | None
@@ -227,33 +276,13 @@ class EvoNetComponentConfig(BaseModel):
         "neurons in hidden layers.",
     )
 
-    # Recurrent connections
-    recurrent: Optional[Literal["none", "direct", "local", "all"]] = "none"
-
     # Name of the initializer function (resolved via initializer registry)
     initializer: str = Field(
         default="default", description="Name of the initializer to use"
     )
 
-    # Connection topology for initialization
-    connection_scope: Literal["adjacent", "crosslayer"] = Field(
-        default="adjacent",
-        description=(
-            "Defines how layers are connected during initialization. "
-            "'adjacent' connects only consecutive layers, while 'crosslayer' "
-            "connects all earlier layers to all later layers."
-        ),
-    )
-
-    connection_density: float = Field(
-        default=1.0,
-        ge=0.0,
-        le=1.0,
-        description=(
-            "Fraction of possible connections actually created during initialization. "
-            "1.0 = fully connected, <1.0 = sparse."
-        ),
-    )
+    # Connectivity
+    connectivity: ConnectivityConfig
 
     # Numeric bounds for values; used by initialization and mutation
     weights: WeightsConfig = Field(default_factory=WeightsConfig)
@@ -335,45 +364,19 @@ class EvoNetComponentConfig(BaseModel):
             raise ValueError("Length of 'activation' list must match 'dim'")
         return act
 
-    @validator("activations_allowed", each_item=True)
-    def validate_activation_name(cls, act_name: str) -> str:
-        """Ensure only valid activation function names are allowed."""
-        if act_name not in ACTIVATIONS:
-            raise ValueError(
-                f"Invalid activation function '{act_name}'. "
-                f"Valid options are: {list(ACTIVATIONS.keys())}"
-            )
-        return act_name
-
-    @validator("recurrent")
-    def validate_recurrent(cls, recurrent: Optional[str]) -> str:
-        """Ensure recurrent preset is valid and normalized."""
-        if recurrent is None:
-            return "none"
-        allowed = {"none", "direct", "local", "all"}
-        if recurrent not in allowed:
-            raise ValueError(
-                f"Invalid recurrent preset '{recurrent}'. "
-                f"Valid options are: {sorted(allowed)}"
-            )
-        return recurrent
-
-    @field_validator("connection_scope")
+    @field_validator("activations_allowed")
     @classmethod
-    def validate_connection_scope(cls, scope: str) -> str:
-        """Ensure connection_scope is one of the supported options."""
-        allowed = {"adjacent", "crosslayer"}
-        if scope not in allowed:
-            raise ValueError(
-                f"Invalid connection_scope '{scope}'. "
-                f"Valid options are: {sorted(allowed)}"
-            )
-        return scope
+    def validate_activations_allowed(
+        cls, acts: Optional[list[str]]
+    ) -> Optional[list[str]]:
+        """Validate that all activation names are known."""
+        if acts is None:
+            return None
 
-    @field_validator("connection_density")
-    @classmethod
-    def validate_connection_density(cls, density: float) -> float:
-        """Ensure connection_density is within [0, 1]."""
-        if not (0.0 <= density <= 1.0):
-            raise ValueError(f"connection_density must be in [0, 1], got {density}.")
-        return density
+        for a in acts:
+            if a not in ACTIVATIONS:
+                raise ValueError(
+                    f"Invalid activation function '{a}'. "
+                    f"Valid options are: {sorted(ACTIVATIONS.keys())}"
+                )
+        return acts

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/initializers/evonet_initializers.py

@@ -14,7 +14,6 @@ from evonet.enums import ConnectionType, NeuronRole
 
 from evolib.config.evonet_component_config import DelayConfig, EvoNetComponentConfig
 from evolib.config.schema import FullConfig
-from evolib.interfaces.enum_helpers import resolve_recurrent_kinds
 from evolib.representation.evonet import EvoNet
 
 
@@ -158,14 +157,14 @@ def _build_architecture(
             dynamics_name = dynamics_cfg.name
             dynamics_params = dynamics_cfg.params or {}
 
-        recurrent_kinds = resolve_recurrent_kinds(cfg.recurrent)
+        allowed_kinds = set(cfg.connectivity.recurrent)
         para.net.add_neuron(
             count=num_neurons,
             activation=activation_name,
             role=role,
             connection_init=connection_init,
             bias=0.0,
-            recurrent=recurrent_kinds if role != NeuronRole.INPUT else None,
+            recurrent=allowed_kinds if role != NeuronRole.INPUT else None,
             connection_scope=para.connection_scope,
             connection_density=para.connection_density,
             dynamics_name=dynamics_name,

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/operators/evonet_structural_mutation.py

@@ -10,7 +10,6 @@ from evonet.mutation import (
 )
 
 from evolib.config.base_component_config import StructuralMutationConfig
-from evolib.interfaces.enum_helpers import resolve_recurrent_kinds
 
 
 def mutate_structure(net: Nnet, cfg: StructuralMutationConfig) -> bool:
@@ -67,7 +66,7 @@ def mutate_structure(net: Nnet, cfg: StructuralMutationConfig) -> bool:
                 cfg.topology.max_connections is None
                 or len(net.get_all_connections()) < cfg.topology.max_connections
             ):
-                allowed_kinds = resolve_recurrent_kinds(cfg.topology.recurrent)
+                allowed_kinds = set(cfg.topology.recurrent)
                 for _ in range(np.random.randint(1, add_cfg.max + 1)):
                     if add_random_connection(
                         net,

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/operators/selection.py

@@ -48,14 +48,19 @@ def _calculate_rank_probabilities(
         raise ValueError("Population size must be at least 1.")
 
     if mode == "linear":
-        # Linear probability: p(i) = 2*(N - i) / (N*(N+1))
-        probabilities = (2 * (population_size - ranks)) / (
-            population_size * (population_size + 1)
-        )
+        # Monotonic decreasing with rank: best gets highest probability
+        weights = population_size - ranks
+        probabilities = weights / np.sum(weights)
+
     elif mode == "exponential":
-        # Exponential probability: p(i) = base^i / sum(base^j)
-        probabilities = np.power(exp_base, ranks)
-        probabilities = probabilities / np.sum(probabilities)
+        if exp_base <= 0:
+            raise ValueError("exp_base must be greater than 0")
+
+        # With exp_base > 1.0: best gets highest probability
+        # rank 0 -> exp_base^0 = 1, rank 1 -> exp_base^-1, ...
+        weights = np.power(exp_base, -ranks)
+        probabilities = weights / np.sum(weights)
+
     else:
         raise ValueError("Selection mode must be either 'linear' or 'exponential'.")
 

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib/representation/evonet.py

@@ -109,13 +109,15 @@ class EvoNet(ParaBase):
         # Define network architecture
         self.dim = cfg.dim
 
+        # Connectivity
+        self.connection_scope = cfg.connectivity.scope
+        self.connection_density = cfg.connectivity.density
+        self.recurrent_kinds = cfg.connectivity.recurrent
+
         # Bounds
         self.weight_bounds = cfg.weights.bounds or (-1.0, 1.0)
         self.bias_bounds = cfg.bias.bounds or (-0.5, 0.5)
 
-        self.connection_scope = cfg.connection_scope
-        self.connection_density = cfg.connection_density
-
         # Mutation
         if cfg.mutation is None:
             raise ValueError("Mutation config is required for EvoNet.")

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10/evolib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evolib
-Version: 0.2.0b4.dev9
+Version: 0.2.0b4.dev10
 Summary: A modular framework for evolutionary strategies and neuroevolution.
 Author-email: EvoLib <evolib@dismail.de>
 License: MIT License

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/evolib.egg-info/SOURCES.txt

@@ -52,7 +52,6 @@ evolib/initializers/net_initializers.py
 evolib/initializers/registry.py
 evolib/initializers/vector_initializers.py
 evolib/interfaces/__init__.py
-evolib/interfaces/enum_helpers.py
 evolib/interfaces/enums.py
 evolib/interfaces/structs.py
 evolib/interfaces/types.py

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/examples/07_evonet/03_delay_bitseq_echo.py

@@ -79,7 +79,7 @@ def fitness_echo(indiv: Indiv) -> None:
     acc = correct / max(count, 1)
 
     indiv.extra_metrics = {"accuracy": acc, "mse": mse}
-    indiv.fitness = mse + (1.0 - acc) / 4.0
+    indiv.fitness = mse + (1.0 - acc) / 2.0
 
 
 def save_plot(pop: Pop) -> None:

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/examples/07_evonet/05_image_approximation.py

@@ -74,14 +74,13 @@ def my_fitness(indiv: Indiv) -> None:
 
 def on_improvement(pop: Pop) -> None:
     best = pop.best()
-    assert best.fitness is not None
     pred_img = predict_image(best, coords, img_size)
     save_frame(
         path=(f"./05_frames/gen_{pop.generation_num:04d}.png"),
         target=target,
         pred=pred_img,
         gen=pop.generation_num,
-        fitness=float(best.fitness),
+        fitness=float(best.fitness or 0.0),
     )
 
 

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "evolib"
-version = "0.2.0b4.dev9"
+version = "0.2.0b4.dev10"
 description = "A modular framework for evolutionary strategies and neuroevolution."
 authors = [
     { name = "EvoLib", email = "evolib@dismail.de" }

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/tests/test_evonet_neuron_dynamics.py

@@ -16,6 +16,10 @@ def test_neuron_dynamics_config_length_matches_dim() -> None:
             type="evonet",
             dim=[1, 2, 1],
             activation=["linear", "tanh", "tanh"],
+            connectivity={
+                "scope": "adjacent",
+                "density": 1.0,
+            },
             weights={
                 "initializer": "normal",
                 "std": 0.5,
@@ -48,9 +52,11 @@ def test_neuron_dynamics_applied_to_neurons() -> None:
                 "dim": [1, 3, 1],
                 "activation": ["linear", "tanh", "tanh"],
                 "initializer": "default",
-                "recurrent": "local",
-                "connection_scope": "adjacent",
-                "connection_density": 1.0,
+                "connectivity": {
+                    "recurrent": "lateral",
+                    "scope": "adjacent",
+                    "density": 1.0,
+                },
                 "weights": {
                     "initializer": "normal",
                     "std": 0.5,

{evolib-0.2.0b4.dev9 → evolib-0.2.0b4.dev10}/tests/test_initializer_evonet.py

@@ -15,6 +15,10 @@ def test_default_initializer_evonet_builds_expected_structure() -> None:
                 "type": "evonet",
                 "dim": [2, 3, 1],
                 "activation": "linear",
+                "connectivity": {
+                    "scope": "adjacent",
+                    "density": 1.0,
+                },
                 "weights": {
                     "initializer": "normal",
                     "std": 0.5,

evolib-0.2.0b4.dev9/evolib/interfaces/enum_helpers.py

@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-from typing import Optional, Set
-
-from evonet.enums import RecurrentKind
-
-
-def resolve_recurrent_kinds(preset: Optional[str]) -> Set[RecurrentKind]:
-    """
-    Map a preset string to the corresponding set of recurrent connection types.
-
-    Parameters
-    ----------
-    preset : Optional[str]
-        One of: "none", "direct", "local", "all", or None.
-
-    Returns
-    -------
-    Set[RecurrentKind]
-        A set of recurrent kinds to use.
-    """
-    if preset is None or preset == "none":
-        return set()
-    elif preset == "direct":
-        return {RecurrentKind.DIRECT}
-    elif preset == "local":
-        return {RecurrentKind.DIRECT, RecurrentKind.LATERAL}
-    elif preset == "all":
-        return {RecurrentKind.DIRECT, RecurrentKind.LATERAL, RecurrentKind.INDIRECT}
-    else:
-        raise ValueError(f"Unknown recurrent preset: {preset}")