Finished iterate of metahandlers

docs/source/metahandlers/api.md

@@ -18,10 +18,6 @@ Here are a few MetaHandlers provided by GeneticEngine
 .. autoapiclass:: geneticengine.grammar.metahandlers.floats.FloatRange
 ```
 
-```{eval-rst}
-.. autoapiclass:: geneticengine.grammar.metahandlers.floats.FloatList
-```
-
 #### Lists
 
 ```{eval-rst}

geneticengine/grammar/metahandlers/floats.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Callable, TypeVar
+from typing import Any, Callable, Generator, TypeVar
 
 from geneticengine.grammar.grammar import Grammar
 from geneticengine.random.sources import RandomSource
@@ -46,33 +46,12 @@ def __class_getitem__(cls, args):
     def __repr__(self):
         return f"[{self.min},{self.max}]"
 
-
-class FloatList(MetaHandlerGenerator):
-    """FloatList([a_1, .., a_n]) restricts floats to be an element from the
-    list [a_1, .., a_n].
-
-    The range can be dynamically altered before the grammar extraction
-        Float.__init__.__annotations__["value"] = Annotated[float, FloatList[a_1, .., a_n]]
-    """
-
-    def __init__(self, elements):
-        self.elements = elements
-
-    def generate(
+    def iterate(
         self,
-        random: RandomSource,
-        grammar: Grammar,
         base_type: type,
-        rec: Callable[[type[T]], T],
-        dependent_values: dict[str, Any],
+        combine_lists: Callable[[list[type]], Generator[Any, Any, Any]],
     ):
-        return random.choice(self.elements)
-
-    def __class_getitem__(cls, args):
-        return FloatList(*args)
-
-    def __repr__(self):
-        return f"[{self.elements}]"
-
-    def validate(self, v) -> bool:
-        return v in self.elements
+        v = self.min
+        while v <= self.max:
+            yield v
+            v += 0.0001

geneticengine/grammar/metahandlers/strings.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 import copy
+import itertools
 import string
-from typing import Any, Callable, TypeVar
+from typing import Any, Callable, Generator, TypeVar
 
 from geneticengine.grammar.grammar import Grammar
 from geneticengine.random.sources import RandomSource
@@ -92,6 +93,17 @@ def __class_getitem__(cls, args):
     def __repr__(self):
         return f"StringSizeBetween[{self.min}...{self.max}]"
 
+    def iterate(
+        self,
+        base_type: type,
+        combine_lists: Callable[[list[type]], Generator[Any, Any, Any]],
+    ):
+        def generate_letter():
+            yield from self.options
+
+        for length in range(self.min, self.max + 1):
+            yield from itertools.product(*(generate_letter() for _ in range(length)))
+
 
 class WeightedStringHandler(MetaHandlerGenerator):
     """This metahandler restricts the creation of string nodes so that the
@@ -136,3 +148,13 @@ def __repr__(self):
 
     def __class_getitem__(cls, args):
         return WeightedStringHandler(*args)
+
+    def iterate(
+        self,
+        base_type: type,
+        combine_lists: Callable[[list[type]], Generator[Any, Any, Any]],
+    ):
+        def generate_letter():
+            yield from self.options
+
+        yield from itertools.product(*(generate_letter() for _ in range(self.probability_matrix.shape[0])))

geneticengine/grammar/metahandlers/vars.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Callable, TypeVar
+from typing import Any, Callable, Generator, TypeVar
 
 from geneticengine.grammar.grammar import Grammar
 from geneticengine.random.sources import RandomSource
@@ -42,3 +42,10 @@ def __repr__(self):
 
     def __class_getitem__(cls, args):
         return VarRange(*args)
+
+    def iterate(
+        self,
+        base_type: type,
+        combine_lists: Callable[[list[type]], Generator[Any, Any, Any]],
+    ):
+        yield from self.options