Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi tour #123

Merged
merged 6 commits into from
Jun 18, 2021
Merged

Multi tour #123

merged 6 commits into from
Jun 18, 2021

Conversation

fonsecadeline
Copy link
Contributor

Prerequisites : #122 (to validate current tests on mapotempo/dev)

Closes : https://gitlab.com/mapotempo/optimizer-api/-/issues/540

@fonsecadeline fonsecadeline force-pushed the multi_tour branch 2 times, most recently from 8b91d4f to 651a1a7 Compare February 2, 2021 14:25
@fonsecadeline fonsecadeline force-pushed the multi_tour branch 2 times, most recently from 189a823 to 58c7607 Compare February 12, 2021 09:34
@fonsecadeline fonsecadeline marked this pull request as draft February 12, 2021 09:35
@fonsecadeline
Copy link
Contributor Author

We need Mapotempo/optimizer-ortools#20 to be merged at the same time.

@fonsecadeline fonsecadeline marked this pull request as ready for review February 12, 2021 09:36
braktar
braktar suggested changes Feb 12, 2021
View reviewed changes
lib/interpreters/multi_trips.rb Show resolved Hide resolved
models/vrp.rb Outdated Show resolved Hide resolved
test/wrappers/ortools_test.rb Outdated Show resolved Hide resolved
wrappers/ortools.rb Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
senhalil
senhalil suggested changes Feb 16, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
api/v01/entities/vrp_input.rb Outdated Show resolved Hide resolved
lib/interpreters/multi_trips.rb Outdated Show resolved Hide resolved
test/models/vehicle_test.rb Outdated Show resolved Hide resolved
test/models/vrp_consistency_test.rb Outdated Show resolved Hide resolved
test/wrappers/ortools_test.rb Outdated Show resolved Hide resolved
senhalil
senhalil suggested changes Feb 17, 2021
View reviewed changes
api/v01/entities/vrp_input.rb Outdated Show resolved Hide resolved
lib/interpreters/multi_trips.rb Outdated Show resolved Hide resolved
test/models/vehicle_test.rb Outdated Show resolved Hide resolved
wrappers/ortools.rb Outdated Show resolved Hide resolved
@fonsecadeline fonsecadeline marked this pull request as draft February 18, 2021 15:52
fonsecadeline
fonsecadeline commented Mar 22, 2021
View reviewed changes
Copy link
Contributor Author

@fonsecadeline fonsecadeline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #145 (comment)

wrappers/ortools.rb Outdated Show resolved Hide resolved
test/wrappers/ortools_test.rb Outdated Show resolved Hide resolved
api/v01/entities/vrp_input.rb Show resolved Hide resolved
@fonsecadeline fonsecadeline marked this pull request as ready for review March 22, 2021 08:04
senhalil
senhalil reviewed Apr 13, 2021
View reviewed changes
Copy link
Contributor

@senhalil senhalil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expose vehicle_trips relation commit

lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
lib/validators.rb Outdated Show resolved Hide resolved
test/models/vrp_consistency_test.rb Outdated Show resolved Hide resolved
senhalil
senhalil reviewed Apr 13, 2021
View reviewed changes
Copy link
Contributor

@senhalil senhalil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partitions are not allowed with vehicle_trips commit

I think this commit can be merged with the precious one.

lib/validators.rb Outdated Show resolved Hide resolved
senhalil
senhalil reviewed Apr 13, 2021
View reviewed changes
Copy link
Contributor

@senhalil senhalil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[OA] multi-trips with lapses commit

I think this commit should also be merged with the main one

api/v01/entities/vrp_input.rb Outdated Show resolved Hide resolved
senhalil
senhalil reviewed Apr 13, 2021
View reviewed changes
Copy link
Contributor

@senhalil senhalil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@fonsecadeline fonsecadeline force-pushed the multi_tour branch 3 times, most recently from e741d2f to a7e6555 Compare April 15, 2021 06:56
@senhalil senhalil added this to the v1.8 milestone Apr 15, 2021
@senhalil senhalil mentioned this pull request Apr 15, 2021
Draft
@fonsecadeline
Copy link
Contributor Author

fonsecadeline commented Apr 15, 2021 •
edited
Loading

This PR needs :

@fonsecadeline fonsecadeline reopened this May 31, 2021
braktar
braktar suggested changes Jun 1, 2021
View reviewed changes
models/concerns/validate_data.rb Outdated Show resolved Hide resolved
models/concerns/validate_data.rb Outdated Show resolved Hide resolved
models/concerns/validate_data.rb Show resolved Hide resolved
models/concerns/validate_data.rb Show resolved Hide resolved
@fonsecadeline fonsecadeline force-pushed the multi_tour branch 2 times, most recently from efacc9b to b47c98c Compare June 2, 2021 15:19
@fonsecadeline
Copy link
Contributor Author

fonsecadeline commented Jun 10, 2021 •
edited
Loading

braktar
braktar suggested changes Jun 16, 2021
View reviewed changes
api/v01/entities/vrp_input.rb Outdated Show resolved Hide resolved
test/real_cases_scheduling_test.rb Outdated Show resolved Hide resolved
test/test_helper.rb Outdated Show resolved Hide resolved
test/test_helper.rb Show resolved Hide resolved
lib/interpreters/periodic_visits.rb Outdated Show resolved Hide resolved
@fonsecadeline fonsecadeline force-pushed the multi_tour branch 2 times, most recently from f6f6680 to 711bcde Compare June 16, 2021 13:07
@fab-girard fab-girard merged commit 57790ba into Mapotempo:dev Jun 18, 2021
@fonsecadeline fonsecadeline deleted the multi_tour branch June 18, 2021 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@braktar braktar braktar approved these changes

@senhalil senhalil senhalil approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
4 participants
@fonsecadeline @braktar @senhalil @fab-girard