add multiple objectives

Signed-off-by: jparisu <[email protected]>

src/sIArena/terrain/Terrain.py

@@ -202,6 +202,25 @@ def is_complete_path(self, path: Path) -> Tuple[bool, str]:
     def get_destination(self):
         return self.destination
 
+    def __str__(self):
+        """Returns a string representation of the terrain"""
+        # Calculate the maximum length of a cell
+        max_length = len(str(self.matrix.max()))
+        # Create the string representation
+        s = "+" + ("-" * (max_length + 2) + "+") * self.m + "\n"
+        for i in range(self.n):
+            for j in range(self.m):
+                s += "|"
+                if (i,j) == self.origin:
+                    s += "O "
+                elif (i,j) == self.destination:
+                    s += "X "
+                else:
+                    s += "  "
+                s += str(self[(i,j)]).rjust(max_length) + " "
+            s += "|\n"
+            s += "+" + ("-" * (max_length + 2) + "+") * self.m + "\n"
+        return s
 
 
 
@@ -214,7 +233,7 @@ def __init__(
                 self,
                 matrix: List[List[int]],
                 origin: Coordinate = None,
-                destinations: Set[Coordinate] = None,
+                destination: Set[Coordinate] = None,
                 cost_function: callable = default_cost_function,
             ):
         """
@@ -226,7 +245,7 @@ def __init__(
         """
         super().__init__(matrix, cost_function)
         self.origin = origin
-        self.destinations = destinations
+        self.destinations = destination
 
         if self.origin is None:
             self.origin = (0, 0)
@@ -236,7 +255,7 @@ def __init__(
         if self.destinations is None:
             self.destinations = {(self.n - 1, self.m - 1)}
         else:
-            self.destinations = destinations
+            self.destinations = destination
 
         # Check that the origin is valid
         if self.origin[0] < 0 and self.origin[0] >= self.n:
@@ -275,3 +294,24 @@ def is_complete_path(self, path: Path) -> Tuple[bool, str]:
 
     def get_destination(self):
         return self.destinations
+
+
+    def __str__(self):
+        """Returns a string representation of the terrain"""
+        # Calculate the maximum length of a cell
+        max_length = len(str(self.matrix.max()))
+        # Create the string representation
+        s = "+" + ("-" * (max_length + 2) + "+") * self.m + "\n"
+        for i in range(self.n):
+            for j in range(self.m):
+                s += "|"
+                if (i,j) == self.origin:
+                    s += "O "
+                elif (i,j) in self.destinations:
+                    s += "X "
+                else:
+                    s += "  "
+                s += str(self[(i,j)]).rjust(max_length) + " "
+            s += "|\n"
+            s += "+" + ("-" * (max_length + 2) + "+") * self.m + "\n"
+        return s

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

src/sIArena/terrain/generator/MazeGenerator.py

@@ -21,11 +21,13 @@ 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:
         """ This inherited method set the min, max and step height of the terrain"""
         return super().generate_random_terrain(
-            n=n, m=m, min_height=0, max_height=n*m, min_step=n*m, abruptness=abruptness, seed=seed, origin=origin, destination=destination)
+            n=n, m=m, min_height=0, max_height=n*m, min_step=n*m, abruptness=abruptness, seed=seed, origin=origin, destination=destination, terrain_ctor=terrain_ctor, cost_function=cost_function)
 
 
     @override