* Included tests for "InsertionAlgorithm". #41

* Improved tests for all "Algorithm" heirs.
* Fixed bug related with the criterion settings.

jinete/algorithms/metaheuristics/grasp.py

@@ -47,8 +47,8 @@ def build_first_solution_algorithm(self, *args, **kwargs) -> Algorithm:
         args = (*self.args, *args)
         kwargs.update(self.kwargs)
 
-        kwargs['episodes'] = self.first_solution_episodes,
-        kwargs['seed'] = self.random.randint(0, MAX_INT),
+        kwargs['episodes'] = self.first_solution_episodes
+        kwargs['seed'] = self.random.randint(0, MAX_INT)
 
         return IterativeAlgorithm(*args, **kwargs)
 

jinete/models/criterions.py

@@ -24,7 +24,7 @@
 
 
 class PlannedTripCriterion(ABC):
-    def __init__(self, name: str, direction: OptimizationDirection):
+    def __init__(self, name: str, direction: OptimizationDirection, *args, **kwargs):
         self.name = name
         self.direction = direction
 
@@ -48,10 +48,11 @@ def nbest(self, n: int, planned_trips: Iterable[PlannedTrip], inplace: bool = Fa
 
 class ShortestTimePlannedTripCriterion(PlannedTripCriterion):
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         super().__init__(
             direction=OptimizationDirection.MINIMIZATION,
             name='Shortest-Time',
+            *args, **kwargs,
         )
 
     def scoring(self, planned_trip: PlannedTrip) -> float:
@@ -63,10 +64,11 @@ def scoring(self, planned_trip: PlannedTrip) -> float:
 
 class LongestTimePlannedTripCriterion(PlannedTripCriterion):
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         super().__init__(
             direction=OptimizationDirection.MAXIMIZATION,
             name='Longest-Time',
+            *args, **kwargs,
         )
 
     def scoring(self, planned_trip: PlannedTrip) -> float:
@@ -78,10 +80,11 @@ def scoring(self, planned_trip: PlannedTrip) -> float:
 
 class LongestUtilTimePlannedTripCriterion(PlannedTripCriterion):
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         super().__init__(
             direction=OptimizationDirection.MAXIMIZATION,
             name='Longest-Time',
+            *args, **kwargs,
         )
 
     def scoring(self, planned_trip: PlannedTrip) -> float:
@@ -93,10 +96,11 @@ def scoring(self, planned_trip: PlannedTrip) -> float:
 
 class HashCodePlannedTripCriterion(PlannedTripCriterion):
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         super().__init__(
             direction=OptimizationDirection.MAXIMIZATION,
             name='Longest-Time',
+            *args, **kwargs,
         )
 
     def scoring(self, planned_trip: PlannedTrip) -> float:

tests/test_algorithms/test_heuristics/test_insertion.py

@@ -34,6 +34,7 @@ def test_optimize(self):
         )
         result = algorithm.optimize()
 
+        # TODO: Properly validate  behaviour of the provided "Result" object.
         self.assertIsNotNone(result)
         self.assertIsInstance(result, jit.Result)
 

tests/test_algorithms/test_heuristics/test_local_search.py

@@ -11,6 +11,7 @@
 class TestLocalSearchAlgorithm(unittest.TestCase):
     job: jit.Job
     fleet: jit.Fleet
+    initial: jit.Result
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -40,6 +41,7 @@ def test_optimize(self):
         )
         result = algorithm.optimize()
 
+        # TODO: Properly validate  behaviour of the provided "Result" object.
         self.assertIsNotNone(result)
         self.assertIsInstance(result, jit.Result)
 

tests/test_algorithms/test_metaheuristics/test_grasp.py

@@ -9,16 +9,32 @@
 
 
 class TestGraspAlgorithm(unittest.TestCase):
+    job: jit.Job
+    fleet: jit.Fleet
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.job = jit.Job(generate_trips(10), objective_cls=jit.DialARideObjective)
+        cls.fleet = jit.Fleet(generate_vehicles(10))
 
     def test_creation(self):
-        job = jit.Job(generate_trips(10), objective_cls=jit.DialARideObjective)
-        fleet = jit.Fleet(generate_vehicles(10))
         algorithm = jit.GraspAlgorithm(
-            job=job,
-            fleet=fleet,
+            job=self.job,
+            fleet=self.fleet,
         )
-        self.assertEqual(algorithm.job, job)
-        self.assertEqual(algorithm.fleet, fleet)
+        self.assertEqual(algorithm.job, self.job)
+        self.assertEqual(algorithm.fleet, self.fleet)
+
+    def test_optimize(self):
+        algorithm = jit.GraspAlgorithm(
+            job=self.job,
+            fleet=self.fleet,
+        )
+        result = algorithm.optimize()
+
+        # TODO: Properly validate  behaviour of the provided "Result" object.
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result, jit.Result)
 
 
 if __name__ == '__main__':

tests/test_algorithms/test_metaheuristics/test_iterative.py

@@ -0,0 +1,41 @@
+import unittest
+
+import jinete as jit
+
+from tests.utils import (
+    generate_vehicles,
+    generate_trips,
+)
+
+
+class TestIterativeAlgorithm(unittest.TestCase):
+    job: jit.Job
+    fleet: jit.Fleet
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.job = jit.Job(generate_trips(10), objective_cls=jit.DialARideObjective)
+        cls.fleet = jit.Fleet(generate_vehicles(10))
+
+    def test_creation(self):
+        algorithm = jit.IterativeAlgorithm(
+            job=self.job,
+            fleet=self.fleet,
+        )
+        self.assertEqual(algorithm.job, self.job)
+        self.assertEqual(algorithm.fleet, self.fleet)
+
+    def test_optimize(self):
+        algorithm = jit.IterativeAlgorithm(
+            job=self.job,
+            fleet=self.fleet,
+        )
+        result = algorithm.optimize()
+
+        # TODO: Properly validate  behaviour of the provided "Result" object.
+        self.assertIsNotNone(result)
+        self.assertIsInstance(result, jit.Result)
+
+
+if __name__ == '__main__':
+    unittest.main()