Remove private embeed wrapper and solver

Author: braktar

Dockerfile

@@ -24,14 +24,6 @@ ENV LANG C.UTF-8
 
 WORKDIR /srv/app
 
-# # Set correct environment variables.
-# RUN apt update && apt install -y \
-#       python3.8 python3-pip && \
-# 	  pip3 install protobuf==3.20.* && \
-#     pip3 install schema && \
-#     pip3 install scikit-learn
-# RUN pip3 install unconstrained-initialization/dependencies/fastvrpy-0.5.2.tar.gz --user
-
 RUN apt update && \
     libgeos=$(apt-cache search 'libgeos-' | grep -P 'libgeos-\d.*' | awk '{print $1}') && \
     apt install -y git libgeos-dev ${libgeos} libicu-dev libglpk-dev nano

api/v01/entities/vrp_input.rb

@@ -154,7 +154,6 @@ module VrpConfiguration
   end
 
   params :vrp_request_preprocessing do
-    optional(:unconstrained_initialization, type: Boolean, desc: 'Use experimental algorithm to find an initial solution')
     optional(:max_split_size, type: Integer, desc: 'Divide the problem into clusters beyond this threshold')
     optional(:partition_method, type: String, documentation: { hidden: true }, desc: '[ DEPRECATED : use partitions structure instead ]')
     optional(:partition_metric, type: Symbol, documentation: { hidden: true }, desc: '[ DEPRECATED : use partitions structure instead ]')

config/access.rb

@@ -26,6 +26,5 @@ module OptimizerWrapper
     'solvers' => { profile: :solvers },
     'vroom' => { profile: :vroom },
     'ortools' => { profile: :ortools },
-    'unconstrained_initialization' => { profile: :unconstrained_initialization },
   }
 end

config/environments/development.rb

@@ -19,7 +19,6 @@
 require './wrappers/demo'
 require './wrappers/vroom'
 require './wrappers/ortools'
-require './wrappers/unconstrained_initialization'
 
 require './lib/cache_manager'
 require './util/logger'
@@ -38,7 +37,6 @@ module OptimizerWrapper
   ORTOOLS_EXEC =
     'LD_LIBRARY_PATH=../or-tools/dependencies/install/lib/:../or-tools/lib/ ../optimizer-ortools/tsp_simple'.freeze
   ORTOOLS = Wrappers::Ortools.new(tmp_dir: TMP_DIR, exec_ortools: ORTOOLS_EXEC)
-  UNCONSTRAINED_INITIALIZATION = Wrappers::UnconstrainedInitialization.new(tmp: TMP_DIR)
 
   PARAMS_LIMIT = { points: 100000, vehicles: 1000 }.freeze
   QUOTAS = [{ daily: 100000, monthly: 1000000, yearly: 10000000 }].freeze # Only taken into account if REDIS_COUNT
@@ -61,7 +59,6 @@ module OptimizerWrapper
       demo: DEMO,
       vroom: VROOM,
       ortools: ORTOOLS,
-      unconstrained_initialization: UNCONSTRAINED_INITIALIZATION,
     },
     profiles: {
       demo: {
@@ -72,14 +69,6 @@ module OptimizerWrapper
         params_limit: PARAMS_LIMIT,
         quotas: QUOTAS, # Only taken into account if REDIS_COUNT
       },
-      unconstrained_initialization: {
-        queue: 'DEFAULT',
-        services: {
-          vrp: [:unconstrained_initialization]
-        },
-        params_limit: PARAMS_LIMIT,
-        quotas: QUOTAS,
-      },
     },
     solve: {
       synchronously: ENV['OPTIM_SOLVE_SYNCHRONOUSLY'] == 'true',

config/environments/production.rb

@@ -19,7 +19,6 @@
 require './wrappers/demo'
 require './wrappers/vroom'
 require './wrappers/ortools'
-require './wrappers/unconstrained_initialization'
 
 require './lib/cache_manager'
 require './util/logger'
@@ -39,7 +38,6 @@ module OptimizerWrapper
   ORTOOLS_EXEC =
     'LD_LIBRARY_PATH=../or-tools/dependencies/install/lib/:../or-tools/lib/ ../optimizer-ortools/tsp_simple'.freeze
   ORTOOLS = Wrappers::Ortools.new(tmp_dir: TMP_DIR, exec_ortools: ORTOOLS_EXEC, threads: 4)
-  UNCONSTRAINED_INITIALIZATION = Wrappers::UnconstrainedInitialization.new(tmp: TMP_DIR)
 
   PARAMS_LIMIT = { points: 100000, vehicles: 1000 }.freeze
   QUOTAS = [{ daily: 100000, monthly: 1000000 }].freeze # Only taken into account if REDIS_COUNT
@@ -62,7 +60,6 @@ module OptimizerWrapper
       demo: DEMO,
       vroom: VROOM,
       ortools: ORTOOLS,
-      unconstrained_initialization: UNCONSTRAINED_INITIALIZATION,
     },
     profiles: {
       demo: {
@@ -73,14 +70,6 @@ module OptimizerWrapper
         params_limit: PARAMS_LIMIT,
         quotas: QUOTAS, # Only taken into account if REDIS_COUNT
       },
-      unconstrained_initialization: {
-        queue: 'DEFAULT',
-        services: {
-          vrp: [:unconstrained_initialization]
-        },
-        params_limit: PARAMS_LIMIT,
-        quotas: QUOTAS,
-      },
     },
     solve: {
       synchronously: ENV['OPTIM_SOLVE_SYNCHRONOUSLY'] == 'true',

config/environments/test.rb

@@ -19,7 +19,6 @@
 require './wrappers/demo'
 require './wrappers/vroom'
 require './wrappers/ortools'
-require './wrappers/unconstrained_initialization'
 require './lib/cache_manager'
 require './util/logger'
 
@@ -38,7 +37,6 @@ module OptimizerWrapper
   ORTOOLS_EXEC =
     'LD_LIBRARY_PATH=../or-tools/dependencies/install/lib/:../or-tools/lib/ ../optimizer-ortools/tsp_simple'.freeze
   ORTOOLS = Wrappers::Ortools.new(tmp_dir: TMP_DIR, exec_ortools: ORTOOLS_EXEC)
-  UNCONSTRAINED_INITIALIZATION = Wrappers::UnconstrainedInitialization.new(tmp_dir: TMP_DIR)
 
   PARAMS_LIMIT = { points: 150, vehicles: 10 }.freeze
   QUOTAS = [{ daily: 100000, monthly: 1000000, yearly: 10000000 }].freeze # Only taken into account if REDIS_COUNT
@@ -61,7 +59,6 @@ module OptimizerWrapper
       demo: DEMO,
       vroom: VROOM,
       ortools: ORTOOLS,
-      unconstrained_initialization: UNCONSTRAINED_INITIALIZATION,
     },
     profiles: {
       demo: {
@@ -97,14 +94,6 @@ module OptimizerWrapper
         params_limit: PARAMS_LIMIT,
         quotas: QUOTAS, # Only taken into account if REDIS_COUNT
       },
-      unconstrained_initialization: {
-        queue: 'DEFAULT',
-        services: {
-          vrp: [:unconstrained_initialization]
-        },
-        params_limit: PARAMS_LIMIT,
-        quotas: QUOTAS,
-      },
       quotas: {
         queue: 'DEFAULT',
         services: {

models/configuration.rb

@@ -34,7 +34,6 @@ class Partition < Base
   end
 
   class Preprocessing < Base
-    field :unconstrained_initialization, default: false
     field :max_split_size, default: nil
     field :cluster_threshold, default: nil
     field :prefer_short_segment, default: false

optimizer_wrapper.rb

@@ -246,25 +246,6 @@ def self.solve(service_vrp, job = nil, block = nil)
           end
         }
 
-        # if unconstrained_initialization parameter is true :
-        # use Localsearch algorithm and inject routes in the vrp
-
-        if vrp.configuration.preprocessing.unconstrained_initialization
-          initial_solution = OptimizerWrapper.config[:services][:unconstrained_initialization].solve(vrp, 'test')
-          routes = initial_solution[:routes].map{ |r| r[:stops].map{ |s| s[:id] } }
-          routes.each_with_index{ |route, index|
-            mission_ids = route
-            r = Models::Route.create(
-              vehicle: vrp.vehicles[index],
-              mission_ids: mission_ids
-            )
-            vrp.routes << r
-          }
-          initial_solution_elapsed_time = tic - Time.now
-          vrp.configuration.resolution.duration =
-            [1, vrp.configuration.resolution.duration - initial_solution_elapsed_time,
-             vrp.configuration.resolution.minimum_duration].max
-        end
         # vrp.periodic_heuristic check the first_solution_stategy which may change right after periodic heuristic
         periodic_heuristic_flag = vrp.periodic_heuristic?
         # TODO: refactor with dedicated class