Account for compatibility in vehicles/jobs evals, also related to #671.

VROOM-Project · Sep 6, 2023 · ce2d998 · ce2d998
1 parent c91574b
commit ce2d998
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/structures/vroom/eval.h b/src/structures/vroom/eval.h
@@ -73,6 +73,8 @@ struct Eval {
   }
 };
 
+constexpr Eval MAX_EVAL = {std::numeric_limits<Cost>::max(),
+                           std::numeric_limits<Duration>::max()};
 constexpr Eval NO_EVAL = {std::numeric_limits<Cost>::max(), 0};
 constexpr Eval NO_GAIN = {std::numeric_limits<Cost>::min(), 0};
 

diff --git a/src/structures/vroom/input/input.cpp b/src/structures/vroom/input/input.cpp
@@ -718,7 +718,8 @@ void Input::set_jobs_vehicles_evals() {
   // in an empty route from vehicle at rank v.
   _jobs_vehicles_evals =
     std::vector<std::vector<Eval>>(jobs.size(),
-                                   std::vector<Eval>(vehicles.size()));
+                                   std::vector<Eval>(vehicles.size(),
+                                                     MAX_EVAL));
 
   for (std::size_t j = 0; j < jobs.size(); ++j) {
     Index j_index = jobs[j].index();
@@ -733,6 +734,11 @@ void Input::set_jobs_vehicles_evals() {
 
     for (std::size_t v = 0; v < vehicles.size(); ++v) {
       const auto& vehicle = vehicles[v];
+
+      if (!vehicle_ok_with_job(v, j)) {
+        continue;
+      }
+
       auto& current_eval = _jobs_vehicles_evals[j][v];
 
       current_eval = is_pickup ? vehicle.eval(j_index, last_job_index) : Eval();