From dfb76e9d985b08aea88f588ba43f5e8f8ad649b6 Mon Sep 17 00:00:00 2001 From: reinterpretcat Date: Sat, 26 Aug 2023 13:44:28 +0200 Subject: [PATCH] Bump version to 1.22.1 * `experimental` recharge stations feature to support basic electric VRP * apply refactorings to some core api * update dependencies * reload is removed from the solution passed as initial (#126) --- CHANGELOG.md | 6 +++++- CITATION.cff | 2 +- Cargo.toml | 12 ++++++------ README.md | 4 ++-- docs/src/concepts/pragmatic/problem/vehicles.md | 2 +- docs/src/getting-started/installation.md | 2 +- rosomaxa/Cargo.toml | 2 +- vrp-cli/src/main.rs | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381d73e46..944ac359b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] + +## [v1.22.1]- 2023-08-26 + ### Added * `experimental` recharge stations feature to support basic electric VRP use case @@ -681,7 +684,8 @@ with Self Organizing MAps and eXtrAs (pronounced as "rosomaha", from russian "р - Initial commit -[Unreleased]: https://github.com/reinterpretcat/vrp/compare/v1.22.0...HEAD +[Unreleased]: https://github.com/reinterpretcat/vrp/compare/v1.22.1...HEAD +[v1.22.1]: https://github.com/reinterpretcat/vrp/compare/v1.22.0...v1.22.1 [v1.22.0]: https://github.com/reinterpretcat/vrp/compare/v1.21.1...v1.22.0 [v1.21.1]: https://github.com/reinterpretcat/vrp/compare/v1.21.0...v1.21.1 [v1.21.0]: https://github.com/reinterpretcat/vrp/compare/v1.20.0...v1.21.0 diff --git a/CITATION.cff b/CITATION.cff index d2e270f69..c522d5345 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -5,7 +5,7 @@ authors: given-names: "Ilya" orcid: "https://orcid.org/0000-0002-7613-7412" title: "Rosomaxa, Vehicle Routing Problem Solver" -version: 1.22.0 +version: 1.22.1 doi: 10.5281/zenodo.4624037 date-released: 2023-08-08 url: "https://github.com/reinterpretcat/vrp" diff --git a/Cargo.toml b/Cargo.toml index 62b5cb914..5efbdbb6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ members = [ ] [workspace.package] -version = "1.22.0" +version = "1.22.1" authors = ["Ilya Builuk "] license = "Apache-2.0" keywords = ["vrp", "optimization"] @@ -25,11 +25,11 @@ edition = "2021" [workspace.dependencies] # internal dependencies -rosomaxa = { path = "rosomaxa", version = "0.7.0" } -vrp-core = { path = "vrp-core", version = "1.22.0" } -vrp-scientific = { path = "vrp-scientific", version = "1.22.0" } -vrp-pragmatic = { path = "vrp-pragmatic", version = "1.22.0" } -vrp-cli = { path = "vrp-cli", version = "1.22.0" } +rosomaxa = { path = "rosomaxa", version = "0.7.1" } +vrp-core = { path = "vrp-core", version = "1.22.1" } +vrp-scientific = { path = "vrp-scientific", version = "1.22.1" } +vrp-pragmatic = { path = "vrp-pragmatic", version = "1.22.1" } +vrp-cli = { path = "vrp-cli", version = "1.22.1" } # external dependencies hashbrown = "0.14.0" diff --git a/README.md b/README.md index 02e476adf..5e11949bf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![build](https://github.com/reinterpretcat/vrp/actions/workflows/build.yaml/badge.svg) [![downloads](https://img.shields.io/crates/d/vrp-core)](https://crates.io/crates/vrp-core) [![codecov](https://codecov.io/gh/reinterpretcat/vrp/branch/master/graph/badge.svg)](https://codecov.io/gh/reinterpretcat/vrp) -[![dependency status](https://deps.rs/crate/vrp-cli/1.22.0/status.svg)](https://deps.rs/crate/vrp-cli/1.22.0) +[![dependency status](https://deps.rs/crate/vrp-cli/1.22.1/status.svg)](https://deps.rs/crate/vrp-cli/1.22.1) [![DOI](https://zenodo.org/badge/238436117.svg)](https://zenodo.org/badge/latestdoi/238436117) ![VRP example](docs/resources/vrp-example.png "VRP with Route Balance") @@ -70,7 +70,7 @@ Another fast way to try vrp solver on your environment is to use `docker` image * **run public image** from `Github Container Registry`: ```bash - docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.22.0 + docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.22.1 ``` * **build image locally** using `Dockerfile` provided: diff --git a/docs/src/concepts/pragmatic/problem/vehicles.md b/docs/src/concepts/pragmatic/problem/vehicles.md index d0a916fd3..269a496a0 100644 --- a/docs/src/concepts/pragmatic/problem/vehicles.md +++ b/docs/src/concepts/pragmatic/problem/vehicles.md @@ -97,7 +97,7 @@ Each shift can have the following properties: - tag (optional): a tag which will be propagated back within the corresponding reload activity in solution - resourceId (optional): a shared reload resource id. It is used to limit amount of deliveries loaded at this reload. See examples [here](../../../examples/pragmatic/basics/reload.md). -- **recharges** (optional, experimental) specifies recharging stations and max distance limit before recharge should happend +- **recharges** (optional, experimental) specifies recharging stations and max distance limit before recharge should happen. See examples [here](../../../examples/pragmatic/basics/recharge.md). ## Related errors diff --git a/docs/src/getting-started/installation.md b/docs/src/getting-started/installation.md index af168b914..97de112d7 100644 --- a/docs/src/getting-started/installation.md +++ b/docs/src/getting-started/installation.md @@ -26,7 +26,7 @@ Another fast way to try vrp solver on your environment is to use `docker` image * **run public image** from `Github Container Registry`: ```bash - docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.22.0 + docker run -it -v $(pwd):/repo --name vrp-cli --rm ghcr.io/reinterpretcat/vrp/vrp-cli:1.22.1 ``` * **build image locally** using `Dockerfile` provided: diff --git a/rosomaxa/Cargo.toml b/rosomaxa/Cargo.toml index 024437b45..1ef1c6a66 100644 --- a/rosomaxa/Cargo.toml +++ b/rosomaxa/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosomaxa" -version = "0.7.0" +version = "0.7.1" description = "A rosomaxa algorithm and other building blocks for creating a solver for optimization problems" authors.workspace = true license.workspace = true diff --git a/vrp-cli/src/main.rs b/vrp-cli/src/main.rs index f4dcd89a6..097834115 100644 --- a/vrp-cli/src/main.rs +++ b/vrp-cli/src/main.rs @@ -29,7 +29,7 @@ mod cli { pub fn get_app() -> Command { Command::new("Vehicle Routing Problem Solver") - .version("1.22.0") + .version("1.22.1") .author("Ilya Builuk ") .about("A command line interface to Vehicle Routing Problem solver") .subcommand(get_analyze_app())