Update ruby version

.env

@@ -0,0 +1,3 @@
+ORTOOLS_URL="https://github.com/google/or-tools/releases/download/v7.8/or-tools_debian-10_v7.8.7959.tar.gz"
+ORTOOLS_VERSION=v7.8 # select from https://github.com/google/or-tools/releases
+RUBY_VERSION=2.7

.github/actions/build.sh

@@ -31,8 +31,8 @@ case $ORTOOLS_VERSION in
 esac
 
 echo "Download asset at ${ORTOOLS_URL}"
-docker build --build-arg ORTOOLS_URL=${ORTOOLS_URL} -f ./Dockerfile -t "${IMAGE_NAME}" .
+docker build --build-arg RUBY_VERSION="2.7" --build-arg ORTOOLS_URL=${ORTOOLS_URL} -f ./Dockerfile -t "${IMAGE_NAME}" .
 docker run -d --name optimizer -t "${IMAGE_NAME}"
 docker exec -i optimizer bash -c "LD_LIBRARY_PATH=/srv/or-tools/lib/ /srv/optimizer-ortools/tsp_simple -time_limit_in_ms 500 -intermediate_solutions -instance_file '/srv/optimizer-ortools/data/test_ortools_single_route_with_route_order' -solution_file '/tmp/optimize-or-tools-output'"
 
-echo "::set-output name=image_name::${IMAGE_NAME}"
+echo "name=image_name::${IMAGE_NAME}" >> $GITHUB_OUTPUT

Dockerfile

@@ -1,25 +1,14 @@
-# 1.0.13 is the latest version containing bundler 2 required for optimizer-api
-FROM phusion/passenger-ruby25:1.0.13
+ARG RUBY_VERSION
+ARG ARCHITECTURE
+
+FROM ${ARCHITECTURE}ruby:${RUBY_VERSION}
 
 ARG ORTOOLS_URL=${ORTOOLS_URL}
 
 LABEL maintainer="Mapotempo <[email protected]>"
 
 WORKDIR /srv/
 
-# Trick to install passenger-docker on Ruby 2.5. Othwerwise `apt-get update` fails with a
-# certificate error. See following links for explanantion:
-# https://issueexplorer.com/issue/phusion/passenger-docker/325
-# and
-# https://issueexplorer.com/issue/phusion/passenger-docker/322
-# Basically, DST Root CA X3 certificates are expired on Setember 2021 and apt-get cannot validate
-# with the old certificates and the certification correction is only done for Ruby 2.6+ on the
-# passenger-docker repo because Ruby 2.5 is EOL.
-RUN mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
-RUN apt update && apt install -y ca-certificates
-RUN mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
-# The above trick can be removed after Ruby version is increased.
-
 RUN apt-get update > /dev/null && \
   apt-get -y install git wget pkg-config build-essential cmake autoconf libtool zlib1g-dev lsb-release > /dev/null
 
@@ -30,4 +19,4 @@ RUN wget -qO- $ORTOOLS_URL | tar xz --strip-components=1 -C /srv/or-tools
 ADD . /srv/optimizer-ortools
 
 WORKDIR /srv/optimizer-ortools
-RUN make -j3 tsp_simple
+RUN make tsp_simple

Makefile

@@ -1,19 +1,30 @@
 OR_TOOLS_TOP=../or-tools
 
-TUTORIAL=resources
+TUTORIAL=./resources
 
-CFLAGS := -std=c++14 -I $(OR_TOOLS_TOP)/include
+# -isystem prevents most of the warnings rooted in or-tools library appearing in our compilation
+CFLAGS := -std=c++14 -isystem$(OR_TOOLS_TOP)/include
 
 # During development uncomment the next line to have debug checks and other verifications
 # DEVELOPMENT = true
 ifeq ($(DEVELOPMENT), true)
-	# -isystem prevents warnings rooted in or-tools library appearing in our compilation
-  CFLAGS := $(CFLAGS) -O0 -DDEBUG -ggdb3 -fsanitize=address -fkeep-inline-functions -fno-inline-small-functions -Wall -Wextra -Wshadow -Wunreachable-code -Winit-self -Wmissing-include-dirs -Wswitch-enum -Wfloat-equal -Wundef -isystem$(OR_TOOLS_TOP)/. -isystem$(OR_TOOLS_TOP)/include
-  CXX := LSAN_OPTION=verbosity=1:log_threads=1 $(CXX)
+  CFLAGS := $(CFLAGS) -O0 -DDEBUG -ggdb3 -fsanitize=address -fkeep-inline-functions -fno-inline-small-functions
+	# CXX := ../callcatcher/build/scripts-3.6/callcatcher $(CXX) # comment out to check uncalled functions
+  CXX := LSAN_OPTION=verbosity=1:log_threads=1 $(CXX) # adress sanitizer works only if the executable launched without gdb
 else
   CFLAGS := $(CFLAGS) -O3 -DNDEBUG
 endif
 
+# Activate warnings
+CFLAGS := $(CFLAGS) -Wall -Wextra -Wshadow -Wmissing-include-dirs -Wswitch-enum -Wfloat-equal -Wundef
+
+# The following is to supress a warning due to a protobuf that is fixed at v3.14.
+# It can be removed when or-tools is upgraded to v8.1+ (where the protobuf dependency is upgraded to v3.14).
+PROTOBUF_VERSION := $(shell $(OR_TOOLS_TOP)/bin/protoc --version | cut -d" " -f2)
+ifeq ($(shell dpkg --compare-versions $(PROTOBUF_VERSION) 'lt' '3.14' && echo true), true)
+	CFLAGS := $(CFLAGS) -Wno-array-bounds
+endif
+
 .PHONY: all local_clean
 
 all: $(EXE)
@@ -34,7 +45,7 @@ tsp_simple.o: tsp_simple.cc ortools_vrp.pb.h \
 	tsptw_data_dt.h \
 	limits.h \
 	values.h
-	$(CXX) $(CFLAGS) -I $(TUTORIAL) -c ./tsp_simple.cc -o tsp_simple.o
+	$(CXX) $(CFLAGS) -isystem$(TUTORIAL) -c ./tsp_simple.cc -o tsp_simple.o
 
 tsp_simple: $(ROUTING_DEPS) tsp_simple.o ortools_vrp.pb.o ortools_result.pb.o $(OR_TOOLS_TOP)/lib/libortools.so
 	$(CXX) $(CFLAGS) -fwhole-program tsp_simple.o ortools_vrp.pb.o ortools_result.pb.o $(OR_TOOLS_LD_FLAGS) \

docker-compose.yml

@@ -0,0 +1,23 @@
+version: '3.7'
+x-app-args: &app-args
+  ARCHITECTURE: ${ARCHITECTURE}
+  ORTOOLS_URL: ${ORTOOLS_URL}
+  ORTOOLS_VERSION: ${ORTOOLS_VERSION}
+  RUBY_VERSION: ${RUBY_VERSION}
+
+x-app: &default-app
+  volumes:
+    - ./:/srv/app/
+  env_file:
+    - ./.env
+
+services:
+  main:
+    <<: *default-app
+    build:
+      args:
+        <<: *app-args
+      context: .
+      dockerfile: Dockerfile
+    image: dev.example.com/mapotempo-ce/optimizer-ortools
+    tty: true

limits.h

@@ -90,8 +90,7 @@ class NoImprovementLimit : public SearchLimit {
       best_result_ = kint64min;
     }
 
-    DCHECK_NOTNULL(objective_var);
-    prototype_->AddObjective(objective_var);
+    prototype_->AddObjective(DCHECK_NOTNULL(objective_var));
   }
 
   virtual void Init() {
@@ -145,7 +144,7 @@ class NoImprovementLimit : public SearchLimit {
 
   virtual void Copy(const SearchLimit* const limit) {
     const NoImprovementLimit* const copy_limit =
-        reinterpret_cast<const NoImprovementLimit* const>(limit);
+        reinterpret_cast<const NoImprovementLimit*>(limit);
 
     best_result_                      = copy_limit->best_result_;
     solution_nbr_tolerance_           = copy_limit->solution_nbr_tolerance_;
@@ -206,8 +205,8 @@ namespace {
 class LoggerMonitor : public SearchMonitor {
 public:
   LoggerMonitor(const TSPTWDataDT& data, RoutingModel* routing,
-                RoutingIndexManager* manager, int64 min_start, int64 size_matrix,
-                bool debug, bool intermediate, ortools_result::Result* result,
+                RoutingIndexManager* manager, int64 size_matrix, bool debug,
+                bool intermediate, ortools_result::Result* result,
                 std::vector<std::vector<IntervalVar*>> stored_rests, std::string filename,
                 const bool minimize = true)
       : SearchMonitor(routing->solver())
@@ -216,7 +215,6 @@ class LoggerMonitor : public SearchMonitor {
       , manager_(manager)
       , solver_(routing->solver())
       , start_time_(absl::GetCurrentTimeNanos())
-      , min_start_(min_start)
       , size_matrix_(size_matrix)
       , minimize_(minimize)
       , limit_reached_(false)
@@ -320,6 +318,7 @@ class LoggerMonitor : public SearchMonitor {
           int64 lateness_cost             = 0;
           int64 overload_cost             = 0;
           bool vehicle_used               = false;
+          const int64 earliest_start      = data_.EarliestStart();
           for (int64 index = routing_->Start(route_nbr); !routing_->IsEnd(index);
                index       = routing_->NextVar(index)->Value()) {
             for (std::vector<IntervalVar*>::iterator it = rests.begin();
@@ -339,7 +338,7 @@ class LoggerMonitor : public SearchMonitor {
                 ortools_result::Activity* rest = route->add_activities();
                 rest->set_type("break");
                 rest->set_id(parsed_name[1]);
-                rest->set_start_time(rest_start_time);
+                rest->set_start_time(rest_start_time + earliest_start);
                 it = rests.erase(it);
               } else {
                 ++it;
@@ -351,7 +350,7 @@ class LoggerMonitor : public SearchMonitor {
             activity->set_index(data_.ProblemIndex(nodeIndex));
             const int64 start_time =
                 routing_->GetMutableDimension(kTime)->CumulVar(index)->Min();
-            activity->set_start_time(start_time);
+            activity->set_start_time(start_time + earliest_start);
             const int64 upper_bound =
                 routing_->GetMutableDimension(kTime)->GetCumulVarSoftUpperBound(index);
             const int64 lateness = std::max<int64>(start_time - upper_bound, 0);
@@ -408,7 +407,7 @@ class LoggerMonitor : public SearchMonitor {
 
           const int64 start_time =
               routing_->GetMutableDimension(kTime)->CumulVar(end_index)->Min();
-          end_activity->set_start_time(start_time);
+          end_activity->set_start_time(start_time + earliest_start);
           const int64 upper_bound =
               routing_->GetMutableDimension(kTime)->GetCumulVarSoftUpperBound(end_index);
           const int64 lateness = std::max<int64>(start_time - upper_bound, 0);
@@ -560,7 +559,6 @@ class LoggerMonitor : public SearchMonitor {
     }
 
     if (debug_ && new_best) {
-      std::cout << "min start : " << min_start_ << std::endl;
       for (RoutingIndexManager::NodeIndex i(0); i < data_.SizeMatrix() - 1; ++i) {
         const int64 index       = manager_->NodeToIndex(i);
         const IntVar* cumul_var = routing_->GetMutableDimension(kTime)->CumulVar(index);
@@ -572,8 +570,8 @@ class LoggerMonitor : public SearchMonitor {
             slack_var->Bound()) {
           std::cout << "Node " << i << " index " << index << " [" << vehicle_var->Value()
                     << "] |";
-          std::cout << (cumul_var->Value() - min_start_) << " + " << transit_var->Value()
-                    << " -> " << slack_var->Value() << std::endl;
+          std::cout << (cumul_var->Value()) << " + " << transit_var->Value() << " -> "
+                    << slack_var->Value() << std::endl;
         }
       }
       std::cout << "-----------" << std::endl;
@@ -597,8 +595,7 @@ class LoggerMonitor : public SearchMonitor {
   }
 
   virtual void Copy(const SearchLimit* const limit) {
-    const LoggerMonitor* const copy_limit =
-        reinterpret_cast<const LoggerMonitor* const>(limit);
+    const LoggerMonitor* const copy_limit = reinterpret_cast<const LoggerMonitor*>(limit);
 
     best_result_       = copy_limit->best_result_;
     cleaned_cost_      = copy_limit->cleaned_cost_;
@@ -615,9 +612,9 @@ class LoggerMonitor : public SearchMonitor {
   // Allocates a clone of the limit
   virtual SearchMonitor* MakeClone() const {
     // we don't to copy the variables
-    return solver_->RevAlloc(
-        new LoggerMonitor(data_, routing_, manager_, min_start_, size_matrix_, debug_,
-                          intermediate_, result_, stored_rests_, filename_, minimize_));
+    return solver_->RevAlloc(new LoggerMonitor(data_, routing_, manager_, size_matrix_,
+                                               debug_, intermediate_, result_,
+                                               stored_rests_, filename_, minimize_));
   }
 
   virtual std::string DebugString() const {
@@ -644,7 +641,6 @@ class LoggerMonitor : public SearchMonitor {
   int64 best_result_;
   double cleaned_cost_;
   double start_time_;
-  int64 min_start_;
   int64 size_matrix_;
   bool minimize_;
   bool limit_reached_;
@@ -661,14 +657,14 @@ class LoggerMonitor : public SearchMonitor {
 } // namespace
 
 LoggerMonitor* MakeLoggerMonitor(const TSPTWDataDT& data, RoutingModel* routing,
-                                 RoutingIndexManager* manager, int64 min_start,
-                                 int64 size_matrix, bool debug, bool intermediate,
+                                 RoutingIndexManager* manager, int64 size_matrix,
+                                 bool debug, bool intermediate,
                                  ortools_result::Result* result,
                                  std::vector<std::vector<IntervalVar*>> stored_rests,
                                  std::string filename, const bool minimize = true) {
   return routing->solver()->RevAlloc(
-      new LoggerMonitor(data, routing, manager, min_start, size_matrix, debug,
-                        intermediate, result, stored_rests, filename, minimize));
+      new LoggerMonitor(data, routing, manager, size_matrix, debug, intermediate, result,
+                        stored_rests, filename, minimize));
 }
 } //  namespace operations_research
 

ortools_vrp.proto

@@ -4,6 +4,7 @@ package ortools_vrp;
 option optimize_for = SPEED;
 
 message Matrix {
+  uint32 size             = 1;
   repeated float time     = 2 [ packed = true ];
   repeated float distance = 3 [ packed = true ];
   repeated float value    = 4 [ packed = true ];
@@ -30,6 +31,8 @@ message Service {
   float exclusion_cost             = 13;
   repeated bool refill_quantities  = 14;
   uint32 problem_index             = 15;
+  string point_id                  = 16;
+  uint32 alternative_index         = 17;
 }
 
 message Rest {
@@ -75,6 +78,7 @@ message Vehicle {
   uint32 additional_setup            = 26;
   bool free_approach                 = 27;
   bool free_return                   = 28;
+  string start_point_id              = 29;
 }
 
 message Relation {