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

CVRPTW & basic Skill-VRP #120

Merged
merged 98 commits into from
Mar 1, 2024
Merged

CVRPTW & basic Skill-VRP #120

merged 98 commits into from
Mar 1, 2024

Conversation

ngastzepeda
Copy link
Contributor

Description

Implemented an environment for CVRPTW (Capacitated vehicle routing problem with time windows) based on the CVRP environment, extended by time windows and keeping track of the current time. Also included a basic implementation of the Skill-VRP where all technicians have the same skill, but different skill levels. Each customer node needs to be serviced by one technician, where the technician's skill-level must be >= the required skill-level at the customer node.

Motivation and Context

The motivation is to extend the range of environments included in rl4co.

Types of changes

What types of changes does your code introduce? Remove all that do not apply:

  • New feature (non-breaking change which adds core functionality)
  • Documentation (update in the documentation)

Checklist

Go over all the following points, and put an x in all the boxes that apply.
If you are unsure about any of these, don't hesitate to ask. We are here to help!

  • My change requires a change to the documentation.
  • I have updated the tests accordingly (required for a bug fix or a new feature).
  • I have updated the documentation accordingly.

ngastzepeda and others added 30 commits November 24, 2023 23:01
@ngastzepeda
created cvrp-dev.py for testing CVRPTWEnv
1de9af8
@ngastzepeda
adjusted cvrp.py to use self.capacity in generate_data()
3ebbef2
@ngastzepeda
first version of CVRPTWEnv, wip
c9dfbdb
@ngastzepeda
Included CVRPTW in context and embeddings to run cvrp-dev.py (needed …
a8e8710 
…for the model)
@n-g-z
Merge branch 'ai4co:main' into cvrptw_wip
c419661
@ngastzepeda
adjusted tensor indexing
953789b
@ngastzepeda
Make vehicle capacity a parameter in get_action_mask() in cvrp.py
8ed04fe
@ngastzepeda
extended time window logic
62d1656
@ngastzepeda
pass x and y limits for rendering as param
1851e23
@ngastzepeda
included cvrptw in embedding_registry
10727bd
@ngastzepeda
update current_time s.t. waiting times are considered (when start_tim…
7206e7e 
…e > new current_time) and the time is reset to 0 when at the depot. Render function.
@ngastzepeda
Merge remote-tracking branch 'upstream/main' into cvrptw_wip
1f8888e
@ngastzepeda
bug-fix current_time
3c8a787
@ngastzepeda
calculate reward as negative tour length
c0c7bea
@ngastzepeda
updated cvrp-dev.py for development purposes
278759e
@ngastzepeda
created new notebook for CVRPTW testing to see plots
33868be
@ngastzepeda
put temp files into separate folders (for cvrptw random policy and vr…
692d13b 
…plib instance loading)
@ngastzepeda
bugfix locs_ordered: was buggy for batch_size = 1
945c443
@ngastzepeda
several small bugfixes in cwrptw for batch_size = 1
a9f63f3
@ngastzepeda
renamed temp files
7073104
@ngastzepeda
downloaded C101 solomon instance
29ce70c
@ngastzepeda
cvrptw.get_reward() back to calling parent class' function
d13c11b
@ngastzepeda
updated notebook to include vrplib instance loading
4f38548
@ngastzepeda
include instance in temp_dev notebook
b83119f
@ngastzepeda
small bugfix in temp_dev notebook
c361d8b
@ngastzepeda
vrplib notebook loading instance
49bd2a4
@ngastzepeda
init and context embeddings for CVRPTW
7deaee2
@ngastzepeda
small bugfix vrplib notebook
3818236
@ngastzepeda
Merge branch 'main' of github.com:ai4co/rl4co into cvrptw_wip
f508ac1
@ngastzepeda
removed num_vehicles as it wasn't used
cce2edd
@ngastzepeda
Moved current-time to reset(), modified load_data() and wrote extract…
23ff770 
…_from_solomon() to load Solomon instances into rl4co and verify own solutions against them.
@ngastzepeda
environments for CVRPTW and Skill VRP for hydra configuration
7c6f3e1
@ngastzepeda
cvrptw run locally
f72ed4c
@ngastzepeda
hydra script for training with C101 Solomon instance parameters
8c4bf96
@ngastzepeda
included checkpoint path for am-cvrptw-C101.yaml
b94876f
@ngastzepeda
hydra script for R101 Solomon instance training
c3984b4
@ngastzepeda
Adjusted _cur_node_embedding() to reshape to include batch size, was …
4bd0717 
…leading to errors for batch_size=1. (May have to adjust code in general, not just CVRPTW!!)
@ngastzepeda
included info log when max_steps was reached in random_policy rollout…
af6cecc 
… to know whether the rollout actually finished or was just ended early
@ngastzepeda
trying basic rollout for Solomon instance, wip
61aa47b
@ngastzepeda
Load Solomon instance and solution for manual verification.
1905c03
@ngastzepeda
included edge_weight calculation parameter
203c18d
@ngastzepeda
included edge weight calculation üarameter for loading vrplib instances
a6603c2
@ngastzepeda
manual euclidean distance calculation (torch.norm rounds to 4 decimals)
5827d91
@ngastzepeda
reverted get_distance to original implementation in ops.py
6cb5828
@ngastzepeda
Adjusted time windows to match definition that time windows denote th…
5343595 
…e time span within which a service has to be *started*
@ngastzepeda
Merge pull request #5 from n-g-z/data_loader_wip
5813050 
CVRP time windows updated
@ngastzepeda
Merge pull request #6 from ai4co/main
824a96b 
Update to lates changes on rl4co/main
@ngastzepeda
removed folder 'nayeli' from experiment folder (only for private use)
1fc01e7
@ngastzepeda
cleaned up code a bit, included a few docstrings
babcb74
@ngastzepeda
further cleanup
bbadf97
@ngastzepeda
Included docstrings for Skill-VRP
93799de
@ngastzepeda
Included vrplib dependency in pyproject.toml
2b8163b
@ngastzepeda ngastzepeda self-assigned this Feb 28, 2024
@ngastzepeda ngastzepeda requested a review from fedebotu February 28, 2024 16:56
fedebotu
fedebotu reviewed Feb 29, 2024
View reviewed changes
Copy link
Member

@fedebotu fedebotu left a comment

Choose a reason for hiding this comment

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

Awesome job! I left some mostly minor comments here and there. Other than that, I think ready to commit!

data/solomon/solutions/C101.sol Outdated Show resolved Hide resolved
rl4co/data/utils.py Show resolved Hide resolved
data/solomon/instances/C101.txt Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
rl4co/envs/routing/svrp.py Outdated Show resolved Hide resolved
@ngastzepeda ngastzepeda merged commit 2b8bcb9 into ai4co:main Mar 1, 2024
12 checks passed
@ngastzepeda ngastzepeda deleted the cvrptw-skillvrp branch March 1, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@N-Wouda N-Wouda N-Wouda left review comments

@cbhua cbhua cbhua left review comments

@fedebotu fedebotu fedebotu left review comments

Assignees

@ngastzepeda ngastzepeda

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ngastzepeda @N-Wouda @cbhua @fedebotu @n-g-z