add SA from old core, minor fixes

aimclub · Dec 18, 2023 · 374217a · 374217a
1 parent 6f1dcba
commit 374217a
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 139 deletions.
diff --git a/gefest/core/opt/adapters/factories.py b/gefest/core/opt/adapters/factories.py
@@ -6,7 +6,7 @@
 
 
 class StructureFactory(RandomGraphFactory):
-    """Simple GEFEST sampler wrap for GOLEM RandomGraphFactory compatibility."""
+    """GOLEM RandomGraphFactory version of GEFEST sampler."""
 
     def __init__(
         self,

diff --git a/gefest/core/opt/objective/objective_eval.py b/gefest/core/opt/objective/objective_eval.py
@@ -1,3 +1,7 @@
+from typing import Union
+
+from golem.utilities.data_structures import ensure_wrapped_in_sequence
+
 from gefest.core.geometry.datastructs.structure import Structure
 from gefest.core.opt.objective.objective import Objective
 from gefest.core.utils import where
@@ -20,10 +24,11 @@ def __init__(
 
     def __call__(
         self,
-        pop: list[Structure],
+        pop: Union[list[Structure], Structure],
         **kwargs,
     ) -> list[Structure]:
         """Calls objectives evaluation."""
+        pop = ensure_wrapped_in_sequence(pop)
         return self.set_pop_objectives(pop=pop)
 
     def set_pop_objectives(

diff --git a/gefest/core/viz/struct_vizualizer.py b/gefest/core/viz/struct_vizualizer.py
@@ -19,10 +19,10 @@ class StructVizualizer:
 
     """
 
-    def __init__(self, domain: Domain):
+    def __init__(self, domain: Domain = None):
         self.domain = domain
 
-    def plot_structure(self, structs: list[Structure], domain=None, infos=None, linestyles='-'):
+    def plot_structure(self, structs: list[Structure], infos=None, linestyles='-', legend=False):
         """The method displays the given list[obj:`Structure`].
 
         Args:
@@ -52,8 +52,8 @@ def plot_structure(self, structs: list[Structure], domain=None, infos=None, line
                 x = [pt.x for pt in boundary.points]
                 y = [pt.y for pt in boundary.points]
                 plt.plot(x, y, 'k')
-                if domain.prohibited_area:
-                    for poly in domain.prohibited_area:
+                if self.domain.prohibited_area:
+                    for poly in self.domain.prohibited_area:
                         self.plot_poly(poly, '-', color='m')
 
             for poly in struct.polygons:
@@ -62,7 +62,9 @@ def plot_structure(self, structs: list[Structure], domain=None, infos=None, line
         lines = [
             Line2D([0], [0], color='black', linewidth=3, linestyle=style) for style in linestyles
         ]
-        plt.legend(lines, infos, loc=2)
+        if legend:
+            plt.legend(lines, infos, loc=2)
+
         return fig
 
     def plot_poly(self, poly, linestyle, **kwargs):
@@ -88,14 +90,14 @@ def plot_poly(self, poly, linestyle, **kwargs):
 class GIFMaker(StructVizualizer):
     """Smple API for saving a series of plots in mp4 with moviepy."""
 
-    def __init__(self, domain) -> None:
+    def __init__(self, domain=None) -> None:
         super().__init__(domain=domain)
         self.frames = []
         self.counter = 0
 
     def create_frame(self, structure, infos):
         """Appends new frame from given structure."""
-        fig = self.plot_structure(structure, self.domain, infos)
+        fig = self.plot_structure(structure, infos)
         numpy_fig = mplfig_to_npimage(fig)
         self.frames.append(numpy_fig)
         plt.close()