add multiple objectives

Signed-off-by: jparisu <[email protected]>
jparisu · Aug 26, 2024 · 319d85a · 319d85a
1 parent 147660e
commit 319d85a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 328 deletions.
diff --git a/src/sIArena/terrain/generator/Generator.py b/src/sIArena/terrain/generator/Generator.py
@@ -19,7 +19,9 @@ def generate_random_terrain(
                 abruptness: float = 0.2,
                 seed: int = None,
                 origin: Coordinate = None,
-                destination: Coordinate = None
+                destination: Coordinate = None,
+                terrain_ctor: Terrain = Terrain,
+                cost_function: callable = None
             ) -> Terrain:
         # Max and min abruptness
         abruptness = min(1, max(0, abruptness))
@@ -45,7 +47,10 @@ def generate_random_terrain(
 
         final_m *= min_step
 
-        return Terrain(final_m, origin=origin, destination=destination)
+        if cost_function is not None:
+            return terrain_ctor(final_m, origin=origin, destination=destination, cost_function=cost_function)
+        else:
+            return terrain_ctor(final_m, origin=origin, destination=destination)
 
 
     @pure_virtual

diff --git a/src/sIArena/terrain/generator/test.ipynb b/src/sIArena/terrain/generator/test.ipynb