Remove trips field in vehicle model, add original info and transform …

…relation types into symbols
Mapotempo · Apr 13, 2021 · 3eee768 · 3eee768
1 parent a24c8ab
commit 3eee768
Show file tree

Hide file tree

Showing 58 changed files with 27 additions and 95 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Removed
 
 - `geometry_polyline` parameter now be provided through `geometry` parameter [#165](https://github.com/Mapotempo/optimizer-api/pull/165)
+- Field `trips` in vehicle model. Use `vehicle_trips` relation instead [#123](https://github.com/Mapotempo/optimizer-api/pull/123)
 
 ### Fixed
 

diff --git a/api/v01/entities/vrp_input.rb b/api/v01/entities/vrp_input.rb
@@ -488,7 +488,6 @@ module VrpVehicles
     optional(:force_start, type: Boolean, documentation: { hidden: true }, desc: '[ DEPRECATED ]')
     optional(:shift_preference, type: String, values: ['force_start', 'force_end', 'minimize_span'], desc: 'Force the vehicle to start as soon as the vehicle timewindow is open,
       as late as possible or let vehicle start at any time. Not available with periodic heuristic, it will always leave as soon as possible.')
-    optional(:trips, type: Integer, default: 1, desc: 'The number of times a vehicle is allowed to return to the depot within its route. Not available with periodic heuristic.')
 
     optional :matrix_id, type: String, desc: 'Related matrix, if already defined'
     optional :value_matrix_id, type: String, desc: 'If any value matrix defined, related matrix index'

diff --git a/lib/interpreters/multi_trips.rb b/lib/interpreters/multi_trips.rb
diff --git a/models/vehicle.rb b/models/vehicle.rb
@@ -57,7 +57,6 @@ class Vehicle < Base
 
     field :force_start, default: false
     field :shift_preference, default: :minimize_span
-    field :trips, default: 1
     field :duration, default: nil
     field :overall_duration, default: nil
     field :distance, default: nil
@@ -92,7 +91,6 @@ class Vehicle < Base
     # validates_numericality_of :global_day_index, allow_nil: true
     # validates_inclusion_of :router_dimension, in: %w( time distance )
     # validates_inclusion_of :shift_preference, in: %w( force_start force_end minimize_span )
-    # validates_numericality_of :trips, greater_than_or_equal_to: 0
     # validates_numericality_of :speed_multiplier
     # validates_numericality_of :duration, greater_than_or_equal_to: 0
     # validates_numericality_of :overall_duration, greater_than_or_equal_to: 0

diff --git a/optimizer_wrapper.rb b/optimizer_wrapper.rb
@@ -24,7 +24,6 @@
 
 require './lib/routers/router_wrapper.rb'
 require './lib/interpreters/multi_modal.rb'
-require './lib/interpreters/multi_trips.rb'
 require './lib/interpreters/periodic_visits.rb'
 require './lib/interpreters/split_clustering.rb'
 require './lib/interpreters/compute_several_solutions.rb'
@@ -200,8 +199,6 @@ def self.solve(service_vrp, job = nil, block = nil)
 
     tic = Time.now
 
-    Interpreters::MultiTrips.new.expand(vrp)
-
     optim_result = nil
 
     unfeasible_services = []

diff --git a/test/fixtures/balanced_split_under_nonuniform_sq_timewindows.dump b/test/fixtures/balanced_split_under_nonuniform_sq_timewindows.dump
diff --git a/test/fixtures/callage_freq.dump b/test/fixtures/callage_freq.dump
diff --git a/test/fixtures/cluster_dichotomious.dump b/test/fixtures/cluster_dichotomious.dump
diff --git a/test/fixtures/cluster_one_phase.dump b/test/fixtures/cluster_one_phase.dump
diff --git a/test/fixtures/cluster_two_phases.dump b/test/fixtures/cluster_two_phases.dump
diff --git a/test/fixtures/dichotomious_approach.dump b/test/fixtures/dichotomious_approach.dump
diff --git a/test/fixtures/dichotomious_check_number_of_services.dump b/test/fixtures/dichotomious_check_number_of_services.dump
diff --git a/test/fixtures/instance_andalucia1_two_vehicles.dump b/test/fixtures/instance_andalucia1_two_vehicles.dump
diff --git a/test/fixtures/instance_andalucia2.dump b/test/fixtures/instance_andalucia2.dump
diff --git a/test/fixtures/instance_baleares2.dump b/test/fixtures/instance_baleares2.dump
diff --git a/test/fixtures/instance_baleares2_with_priority.dump b/test/fixtures/instance_baleares2_with_priority.dump
diff --git a/test/fixtures/instance_clustered.dump b/test/fixtures/instance_clustered.dump
diff --git a/test/fixtures/instance_order.dump b/test/fixtures/instance_order.dump
diff --git a/test/fixtures/instance_same_point_day.dump b/test/fixtures/instance_same_point_day.dump
diff --git a/test/fixtures/length_centroid.dump b/test/fixtures/length_centroid.dump
diff --git a/test/fixtures/max_split_functionality.dump b/test/fixtures/max_split_functionality.dump
diff --git a/test/fixtures/minimum_duration_lapse_shipments.dump b/test/fixtures/minimum_duration_lapse_shipments.dump
diff --git a/test/fixtures/no_doubles_3000.dump b/test/fixtures/no_doubles_3000.dump
diff --git a/test/fixtures/ortools_global_six_routes_without_rest.dump b/test/fixtures/ortools_global_six_routes_without_rest.dump
diff --git a/test/fixtures/ortools_global_ten_routes_without_rest.dump b/test/fixtures/ortools_global_ten_routes_without_rest.dump
diff --git a/test/fixtures/ortools_multimodal_route.dump b/test/fixtures/ortools_multimodal_route.dump
diff --git a/test/fixtures/ortools_multimodal_route2.dump b/test/fixtures/ortools_multimodal_route2.dump
diff --git a/test/fixtures/ortools_one_route_many_stops.dump b/test/fixtures/ortools_one_route_many_stops.dump
diff --git a/test/fixtures/ortools_one_route_with_rest.dump b/test/fixtures/ortools_one_route_with_rest.dump
diff --git a/test/fixtures/ortools_one_route_with_rest_and_waiting_time.dump b/test/fixtures/ortools_one_route_with_rest_and_waiting_time.dump
diff --git a/test/fixtures/ortools_one_route_with_single_mtws.dump b/test/fixtures/ortools_one_route_with_single_mtws.dump
diff --git a/test/fixtures/ortools_one_route_without_rest.dump b/test/fixtures/ortools_one_route_without_rest.dump
diff --git a/test/fixtures/ortools_one_route_without_rest_2.dump b/test/fixtures/ortools_one_route_without_rest_2.dump
diff --git a/test/fixtures/ortools_open_timewindows.dump b/test/fixtures/ortools_open_timewindows.dump
diff --git a/test/fixtures/ortools_optimize_each.dump b/test/fixtures/ortools_optimize_each.dump
diff --git a/test/fixtures/ortools_performance_when_duration_limit.dump b/test/fixtures/ortools_performance_when_duration_limit.dump
diff --git a/test/fixtures/ortools_single_route_with_route_order.dump b/test/fixtures/ortools_single_route_with_route_order.dump
diff --git a/test/fixtures/ortools_single_route_with_route_order_2.dump b/test/fixtures/ortools_single_route_with_route_order_2.dump
diff --git a/test/fixtures/performance_12vl.dump b/test/fixtures/performance_12vl.dump
diff --git a/test/fixtures/performance_13vl.dump b/test/fixtures/performance_13vl.dump
diff --git a/test/fixtures/performance_britanny.dump b/test/fixtures/performance_britanny.dump
diff --git a/test/fixtures/pud_initial_routes.dump b/test/fixtures/pud_initial_routes.dump
diff --git a/test/fixtures/quality_with_minimum_stops_in_route.dump b/test/fixtures/quality_with_minimum_stops_in_route.dump
diff --git a/test/fixtures/results_regularity.dump b/test/fixtures/results_regularity.dump
diff --git a/test/fixtures/results_regularity_2.dump b/test/fixtures/results_regularity_2.dump
diff --git a/test/fixtures/route_initialisation.dump b/test/fixtures/route_initialisation.dump
diff --git a/test/fixtures/same_point_day_relaxation.dump b/test/fixtures/same_point_day_relaxation.dump
diff --git a/test/fixtures/scheduling_and_ortools.dump b/test/fixtures/scheduling_and_ortools.dump
diff --git a/test/fixtures/scheduling_with_post_process.dump b/test/fixtures/scheduling_with_post_process.dump
diff --git a/test/fixtures/treatment_site.dump b/test/fixtures/treatment_site.dump
diff --git a/test/fixtures/two_phases_clustering_sched_with_freq_and_same_point_day_5veh.dump b/test/fixtures/two_phases_clustering_sched_with_freq_and_same_point_day_5veh.dump
diff --git a/test/fixtures/vroom_optimize_each.dump b/test/fixtures/vroom_optimize_each.dump
diff --git a/test/fixtures/vrp_allow_partial_assigment_false.dump b/test/fixtures/vrp_allow_partial_assigment_false.dump
diff --git a/test/fixtures/vrp_ten_routes_with_rest.dump b/test/fixtures/vrp_ten_routes_with_rest.dump
diff --git a/test/fixtures/without_same_point_day.dump b/test/fixtures/without_same_point_day.dump
diff --git a/test/lib/interpreters/multi_trips_test.rb b/test/lib/interpreters/multi_trips_test.rb
@@ -19,25 +19,6 @@
 require 'date'
 
 class MultiTripsTest < Minitest::Test
-  def test_expand_vehicles_trips
-    vrp = VRP.lat_lon
-    vrp[:vehicles].first[:trips] = 2
-
-    vrp = Interpreters::MultiTrips.new.expand(TestHelper.create(vrp))
-
-    assert_equal 2, vrp.vehicles.size
-    assert_equal 1, vrp.relations.size
-    vrp.relations.each{ |relation|
-      assert_equal :vehicle_trips, relation.type
-      assert_includes relation.linked_vehicle_ids, 'vehicle_0_trip_0'
-      assert_includes relation.linked_vehicle_ids, 'vehicle_0_trip_1'
-    }
-
-    Interpreters::MultiTrips.new.expand(vrp) # consecutive MultiTrips.expand should not produce any error neither inconsistency
-    assert_equal 2, vrp.vehicles.size
-    assert_equal 1, vrp.relations.size
-  end
-
   def test_solve_vehicles_trips_capacity
     vrp = VRP.lat_lon_capacitated
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
@@ -46,15 +27,22 @@ def test_solve_vehicles_trips_capacity
 
     # increasing number of trips increases overall available capacity and reduces unassigned :
 
-    vrp[:vehicles].first[:trips] = 2
+    vrp[:vehicles] << vrp[:vehicles].first.dup
+    vrp[:vehicles].last[:id] += '_second_trip'
+    vrp[:relations] = [{
+      type: 'vehicle_trips',
+      linked_vehicle_ids: [vrp[:vehicles].first[:id], vrp[:vehicles].last[:id]]
+    }]
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
     assert_equal 2, result[:routes].size
     assert_equal 2, result[:unassigned].size
     routes_start = result[:routes].collect{ |route| route[:activities].first[:begin_time] }
     routes_end = result[:routes].collect{ |route| route[:activities].last[:begin_time] }
     assert_operator routes_end[0], :<=, routes_start[1]
 
-    vrp[:vehicles].first[:trips] = 3
+    vrp[:vehicles] << vrp[:vehicles].first.dup
+    vrp[:vehicles].last[:id] += '_third_trip'
+    vrp[:relations].first[:linked_vehicle_ids] << vrp[:vehicles].last[:id]
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
     assert_equal 3, result[:routes].size
     assert_empty result[:unassigned]
@@ -68,22 +56,30 @@ def test_solve_vehicles_trips_capacity
   def test_solve_vehicles_trips_duration
     vrp = VRP.basic
     vrp[:matrices].first[:time] = vrp[:matrices].first[:time].collect{ |l| l.collect{ |v| v.positive? ? 4 : 0 } }
-    vrp[:vehicles].first[:duration] = 4
+    vrp[:vehicles].first[:end_point_id] = vrp[:vehicles].first[:start_point_id]
+    vrp[:vehicles].first[:duration] = 10
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
     assert_equal 1, result[:routes].size
     assert_equal 2, result[:unassigned].size
 
     # increasing number of trips increases overall available duration and reduces unassigned :
 
-    vrp[:vehicles].first[:trips] = 2
+    vrp[:vehicles] << vrp[:vehicles].first.dup
+    vrp[:vehicles].last[:id] += '_second_trip'
+    vrp[:relations] = [{
+      type: 'vehicle_trips',
+      linked_vehicle_ids: [vrp[:vehicles].first[:id], vrp[:vehicles].last[:id]]
+    }]
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
     assert_equal 2, result[:routes].size
     assert_equal 1, result[:unassigned].size
     routes_start = result[:routes].collect{ |route| route[:activities].first[:begin_time] }
     routes_end = result[:routes].collect{ |route| route[:activities].last[:begin_time] }
     assert_operator routes_end[0], :<=, routes_start[1]
 
-    vrp[:vehicles].first[:trips] = 3
+    vrp[:vehicles] << vrp[:vehicles].first.dup
+    vrp[:vehicles].last[:id] += '_third_trip'
+    vrp[:relations].first[:linked_vehicle_ids] << vrp[:vehicles].last[:id]
     result = OptimizerWrapper.wrapper_vrp('demo', { services: { vrp: [:ortools] }}, TestHelper.create(vrp), nil)
     assert_equal 3, result[:routes].size
     assert_empty result[:unassigned]

diff --git a/test/real_cases_scheduling_test.rb b/test/real_cases_scheduling_test.rb
@@ -75,7 +75,7 @@ def test_without_same_point_day
       result = OptimizerWrapper.wrapper_vrp('ortools', { services: { vrp: [:ortools] }}, vrp, nil)
       assert_equal expecting, result[:routes].sum{ |route| route[:activities].count{ |stop| stop[:service_id] } } + result[:unassigned].size
       unassigned = result[:unassigned].size
-      assert_equal 46, unassigned
+      assert_equal 49, unassigned
 
       vrp = TestHelper.load_vrp(self)
       vrp.resolution_solver = true
@@ -235,7 +235,7 @@ def test_performance_12vl
 
       # voluntarily equal to watch evolution of scheduling algorithm performance
       assert_equal expected, seen, 'Do not have the expected number of total visits'
-      assert_equal 280, unassigned_visits.sum, 'Do not have the expected number of unassigned visits'
+      assert_equal 315, unassigned_visits.sum, 'Do not have the expected number of unassigned visits'
     end
 
     def test_minimum_stop_in_route
@@ -251,7 +251,7 @@ def test_minimum_stop_in_route
       result = OptimizerWrapper.wrapper_vrp('ortools', { services: { vrp: [:ortools] }}, vrp, nil)
       assert result[:routes].all?{ |r| (r[:activities].size - 2).zero? || r[:activities].size - 2 >= 5 }, 'Expecting no route with less than 5 stops unless it is empty'
       assert_operator(should_remain_assigned, :<=, result[:routes].sum{ |r| r[:activities].size - 2 })
-      assert_equal 19, result[:unassigned].size
+      assert_equal 21, result[:unassigned].size
       assert_equal vrp.visits, result[:routes].sum{ |r| r[:activities].count{ |a| a[:service_id] } } + result[:unassigned].size
 
       all_ids = (result[:routes].flat_map{ |route| route[:activities].collect{ |stop| stop[:service_id] } }.compact + result[:unassigned].collect{ |un| un[:service_id] }).uniq
@@ -274,7 +274,7 @@ def test_performance_13vl
 
       # voluntarily equal to watch evolution of scheduling algorithm performance
       assert_equal expected, seen, 'Do not have the expected number of total visits'
-      assert_equal 294, unassigned_visits.sum, 'Do not have the expected number of unassigned visits'
+      assert_equal 298, unassigned_visits.sum, 'Do not have the expected number of unassigned visits'
     end
 
     def test_fill_days_and_post_processing
@@ -287,7 +287,7 @@ def test_fill_days_and_post_processing
       assert_equal vrp.visits,
                    result[:routes].sum{ |r| r[:activities].count{ |s| s[:service_id] } } + result[:unassigned].size,
                    'Do not have the expected number of total visits'
-      assert_equal 74, result[:unassigned].size, 'Do not have the expected number of unassigned visits'
+      assert_equal 39, result[:unassigned].size, 'Do not have the expected number of unassigned visits'
     end
 
     def test_treatment_site

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -102,9 +102,7 @@ def self.coerce(vrp)
     vrp[:configuration][:preprocessing][:partitions]&.each{ |partition| partition[:entity] = partition[:entity].to_sym } if vrp[:configuration] && vrp[:configuration][:preprocessing]
     vrp.preprocessing_partitions&.each{ |partition| partition[:entity] = partition[:entity].to_sym } if vrp.is_a?(Models::Vrp)
 
-    vrp.provide_original_info unless vrp.is_a?(Hash) # TODO: re-dump with this modification
-
-    vrp[:relations]&.each{ |r| r[:type] = r[:type]&.to_sym } # TODO: re-dump with this modification
+    vrp[:relations]&.each{ |r| r[:type] = r[:type]&.to_sym }
 
     vrp
   end