Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
krashish8 authored Jul 17, 2024
2 parents a379bcb + 69083dd commit 6385723
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 5 deletions.
9 changes: 9 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ v0.2.0 Release Notes
- vrp_vroomJobsPlain
- vrp_vroomShipmentsPlain

- VRP

- vrp_compatibleVehicles
- vrp_optimize
- vrp_pickDeliverAdd
- vrp_pickDeliver
- vrp_simulation
- vrp_viewRoute

v0.1.0 Release Notes
*******************************************************************************

Expand Down
6 changes: 5 additions & 1 deletion doc/general/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ Individuals (in alphabetical order)

- Adding Google Or tools functionality to vrprouting

- Joseph Percival

- Optimized and added several VRP functions, including: tabu, pickDeliver, pickDeliver_driver, and many others.

- Virginia Vergara

- Porting the code from pgRouting
Expand All @@ -78,7 +82,6 @@ Corporate Sponsors (in alphabetical order)
These are corporate entities that have contributed developer time, hosting, or direct monetary funding to the vrpRouting project:

- `Georepublic <https://georepublic.info/en/>`__
- `Leopark <https://www.leopark.mx/>`__
- `Paragon Corporation <https://www.paragoncorporation.com/>`__

Contributors Past & Present:
Expand All @@ -93,6 +96,7 @@ Individuals (in alphabetical order)
`Ashish Kumar <[email protected]>`__
`Daniel Kastl <[email protected]>`__
`Joseph Percival <[email protected]>`__
`Vicky Vergara <[email protected]>`__
`Manas Sivakumar <[email protected]>`__

Expand Down
9 changes: 9 additions & 0 deletions doc/general/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ v0.2.0 Release Notes
- vrp_vroomJobsPlain
- vrp_vroomShipmentsPlain

- VRP

- vrp_compatibleVehicles
- vrp_optimize
- vrp_pickDeliverAdd
- vrp_pickDeliver
- vrp_simulation
- vrp_viewRoute

v0.1.0 Release Notes
*******************************************************************************

Expand Down
4 changes: 0 additions & 4 deletions doc/general/support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,3 @@ contributed to the development of vrpRouting:
* - Paragon Corporation
- United States
- https://www.paragoncorporation.com
* - Leopark
- Mexico
- https://www.leopark.mx

0 comments on commit 6385723

Please sign in to comment.