Max value cluster

.github/workflows/main.yml

@@ -64,6 +64,12 @@ jobs:
           echo $(ls -lh vendor/bundle)
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+          registry: ${{ secrets.REGISTRY }}
       - name: Build
         uses: docker/build-push-action@v2
         with:

api/v01/entities/vrp_input.rb

@@ -177,6 +177,7 @@ module VrpConfiguration
     optional(:stable_iterations, type: Integer, allow_blank: false, documentation: { hidden: true }, desc: 'DEPRECATED : Jsprit solver and related parameters are not supported anymore')
     optional(:stable_coefficient, type: Float, allow_blank: false, documentation: { hidden: true }, desc: 'DEPRECATED : Jsprit solver and related parameters are not supported anymore')
     optional(:initial_time_out, type: Integer, allow_blank: false, documentation: { hidden: true }, desc: '[ DEPRECATED : use minimum_duration instead]')
+    optional(:strict_skills, type: Boolean, allow_blank: false, documentation: { hidden: true }, desc: 'All skills must be taken into during resolution')
     optional(:minimum_duration, type: Integer, allow_blank: false, desc: 'Minimum solve duration before the solve could stop (x10 in order to find the first solution) (ORtools only)')
     optional(:time_out_multiplier, type: Integer, desc: 'The solve could stop itself if the solve duration without finding a new solution is greater than the time currently elapsed multiplicate by this parameter (ORtools only)')
     optional(:vehicle_limit, type: Integer, desc: 'Limit the maximum number of vehicles within a solution. Not available with periodic heuristic.')

docker/Dockerfile

@@ -20,6 +20,11 @@ ENV LANG C.UTF-8
 # Set correct environment variables.
 ENV HOME /root
 
+RUN apt update && apt install -y python3.8 python3-pip && \
+	 pip3 install protobuf==3.20.* && \
+   pip3 install schema && \
+   pip3 install scikit-learn
+
 # 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
@@ -40,9 +45,14 @@ RUN apt-get update > /dev/null && \
 COPY --chown=app . /srv/app/
 RUN install -d --owner app /srv/app/archives
 
-USER app
+USER root
 WORKDIR /srv/app
 
+RUN pip3 install unconstrained-initialization/dependencies/fastvrpy-0.5.2.tar.gz --user
+
+
+
+USER app
 RUN gem install bundler --version 2.2.24 && \
   bundle --version && \
   bundle install --path vendor/bundle --full-index --without ${BUNDLE_WITHOUT} -j $(nproc)

lib/filters.rb

@@ -19,9 +19,9 @@
 module Filters
   def self.filter(vrp)
     merge_timewindows(vrp)
-
-    filter_skills(vrp)
-
+    unless vrp.configuration.resolution.strict_skills
+      filter_skills(vrp)
+    end
     # calculate_unit_precision # TODO: treat only input vrp, not all models in memory from other vrps
     nil
   end

lib/interpreters/split_clustering.rb

@@ -1473,6 +1473,20 @@ def add_duration_from_and_to_depot(vrp, data_items)
           end
           log "matrix computed in #{(Time.now - tic).round(2)} seconds"
 
+          max_time_from_depot = 0
+          max_time_to_depot = 0
+
+          time_matrix_from_depot.map{ |matrix|
+            matrix.map{ |time|
+              ((time > max_time_from_depot) && (time != 2147483647)) ? max_time_from_depot = time : nil
+            }
+          }
+          time_matrix_to_depot.map{ |matrix|
+            matrix.map{ |time|
+              ((time > max_time_to_depot) && (time != 2147483647)) ? max_time_to_depot = time : nil
+            }
+          }
+
           v_index = {
             from: vrp.vehicles.collect{ |v|
               start_loc = v.start_point&.location
@@ -1488,8 +1502,10 @@ def add_duration_from_and_to_depot(vrp, data_items)
             point[4][:duration_from_and_to_depot] = []
 
             vrp.vehicles.each_with_index{ |_vehicle, v_i|
-              duration_from = time_matrix_from_depot[v_index[:from][v_i]][p_index] if v_index[:from][v_i]
-              duration_to = time_matrix_to_depot[p_index][v_index[:to][v_i]] if v_index[:to][v_i]
+              duration_from = [time_matrix_from_depot[v_index[:from][v_i]][p_index], max_time_from_depot * 3].min\
+               if v_index[:from][v_i]
+              duration_to = [time_matrix_to_depot[p_index][v_index[:to][v_i]], max_time_to_depot * 3].min if\
+               v_index[:to][v_i]
 
               # TODO: investigate why division by vehicle.router_options[:speed_multiplier]
               # detoriarates the performance of periodic

models/configuration.rb

@@ -77,6 +77,7 @@ class Resolution < Base
     field :variation_ratio, default: nil
     field :batch_heuristic, default: false
     field :repetition, default: nil
+    field :strict_skills, default: false
 
     # random_seed parameter is set by the API during the POST process before dumping the VRP
     # it is to make the runs repeatable/reproducible and simplifies comparing different environments

test/wrappers/ortools_test.rb

@@ -5307,4 +5307,69 @@ def test_activities_order
     unassigned_stops = solution.unassigned_stops
     assert_equal 2, unassigned_stops.size
   end
+
+  def test_strict_skills
+    ortools = OptimizerWrapper.config[:services][:ortools]
+    problem = {
+      matrices: [{
+        id: 'matrix_0',
+        time: [
+          [0, 1, 1],
+          [1, 0, 1],
+          [1, 1, 0]
+        ]
+      }],
+      points: [{
+        id: 'point_0',
+        matrix_index: 0
+      }, {
+        id: 'point_1',
+        matrix_index: 1
+      }, {
+        id: 'point_2',
+        matrix_index: 2
+      }],
+      vehicles: [{
+        id: 'vehicle_0',
+        start_point_id: 'point_0',
+        matrix_id: 'matrix_0'
+      }],
+      services: [{
+        id: 'service_1',
+        skills: ['frozen'],
+        activity: {
+          point_id: 'point_1'
+        }
+      }, {
+        id: 'service_2',
+        skills: ['frozen'],
+        activity: {
+          point_id: 'point_2'
+        }
+      }],
+      configuration: {
+        resolution: {
+          strict_skills: true,
+          duration: 20,
+        }
+      }
+    }
+
+    vrp_strict = TestHelper.create(problem)
+
+    Filters.filter(vrp_strict)
+
+    solution_strict = ortools.solve(vrp_strict, 'test')
+
+    assert_equal 1, solution_strict.routes.size
+    assert_equal problem[:services].size, solution_strict.unassigned_stops.size
+
+    problem_unstrict = Marshal.load(Marshal.dump(problem))
+    problem_unstrict[:configuration][:resolution][:strict_skills] = false
+    vrp_unstrict = TestHelper.create(problem_unstrict)
+    Filters.filter(vrp_unstrict)
+    solution_unstrict = ortools.solve(vrp_unstrict, 'test')
+    assert_equal 1, solution_unstrict.routes.size
+    assert_equal 0, solution_unstrict.unassigned_stops.size
+  end
 end