Update toolchain version to 1.81

Author: reinterpretcat

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.80-alpine AS Builder
+FROM rust:1.81-alpine AS Builder
 
 LABEL maintainer="Ilya Builuk <ilya.builuk@gmail.com>" \
       org.opencontainers.image.title="A Vehicle Routing Problem solver CLI" \

experiments/heuristic-research/src/solver/proxies.rs

@@ -147,10 +147,8 @@ where
     }
 
     fn select<'a>(&'a self) -> Box<dyn Iterator<Item = &Self::Individual> + 'a> {
-        Box::new(self.inner.select().map(|individual| {
+        Box::new(self.inner.select().inspect(|&individual| {
             self.acquire().on_select.entry(self.generation).or_default().push(individual.into());
-
-            individual
         }))
     }
 

rosomaxa/src/utils/environment.rs

@@ -115,7 +115,7 @@ impl Parallelism {
     }
 
     /// Executes operation on thread pool with given index. If there is no thread pool with such
-    /// index, then executes it without using any of thread pools.
+    /// an index, then execute it without using any of thread pools.
     pub fn thread_pool_execute<OP, R>(&self, idx: usize, op: OP) -> R
     where
         OP: FnOnce() -> R + Send,
@@ -128,7 +128,7 @@ impl Parallelism {
         }
     }
 
-    /// Returns amount of thread pools used. Returns zero if default thread pool is used.
+    /// Returns number of non-default thread pools. Returns zero if only default thread pool is used.
     pub fn thread_pool_size(&self) -> usize {
         self.thread_pools.as_ref().map_or(0, |tp| tp.len())
     }

rosomaxa/src/utils/iterators.rs

@@ -108,7 +108,7 @@ pub fn create_range_sampling_iter<I: Iterator>(
 /// The general idea is to sample values from the sequence uniformly, find the best from them and
 /// check adjusted range, formed by these sampled values. The general motivation is that in many
 /// domains values are not distributed randomly and this approach can quickly explore promising
-/// regions and start exploiting them, significantly reducing total amount of probes.
+/// regions and start exploiting them, significantly reducing the total number of probes.
 ///
 /// For example:
 ///
@@ -124,7 +124,7 @@ pub fn create_range_sampling_iter<I: Iterator>(
 ///     - 6 sample: 58 at 11
 ///     - 7 sample: 31 at 12
 ///  - here we found a better maximum (58), so we update current best and continue with further shrinking the search range
-///  - we repeat the process till trivial range is reached
+///  - we repeat the process till trivial (empty) range is reached
 ///
 pub trait SelectionSamplingSearch: Iterator {
     /// Searches using selection sampling algorithm.
@@ -185,13 +185,13 @@ pub trait SelectionSamplingSearch: Iterator {
                                 }
                             }
 
-                            // avoid evaluating same item twice by checking the probe
+                            // avoid evaluating the same item twice by checking the probe
                             if is_new_item {
                                 let item_value = map_fn(item);
                                 // if a new found, set the search range to adjusted left and right items
                                 if compare_fn(&item_value, best_value) {
                                     acc.best = BestItem::Fresh((item_idx, item_value));
-                                    // keep same index for left/right if it is a first/last probe
+                                    // keep the same index for left/right if it is a first/last probe
                                     acc.left = if probe_idx == 0 { acc.left } else { acc.last + 1 };
                                     acc.right = if probe_idx == last_probe_idx { orig_right } else { item_idx };
                                 }
@@ -245,7 +245,7 @@ impl<T> Debug for BestItem<T> {
     }
 }
 
-/// Keeps  track of search state for selection sampling search.
+/// Keeps track of search state for selection sampling search.
 struct SearchState<const N: usize, T> {
     left: usize,
     right: usize,

rosomaxa/src/utils/types.rs

@@ -8,8 +8,8 @@ use std::ops::ControlFlow;
 
 /// Alias to a scalar floating type.
 ///
-/// NOTE: Currently, prefer to use `f64` as a default floating type  as switching to `f32` leads
-/// to precision issues within solution checker (at least). No clear performance benefits were not found.
+/// NOTE: Currently, prefer to use `f64` as a default floating type as switching to `f32` leads
+/// to precision issues within the solution checker (at least). No clear performance benefits were found.
 pub type Float = f64;
 
 /// Unwraps value from inner state.

vrp-cli/src/lib.rs

@@ -221,6 +221,8 @@ mod c_interop {
 
         #[test]
         fn can_use_callback() {
+            // TODO: real check that data is passed is not really there
+
             extern "C" fn success1(_: *const c_char) {}
             extern "C" fn failure1(_: *const c_char) {
                 unreachable!()
@@ -232,11 +234,6 @@ mod c_interop {
             }
             extern "C" fn failure2(_: *const c_char) {}
             call_back(Err("failure".into()), success2, failure2);
-
-            let result = std::panic::catch_unwind(|| {
-                call_back(Err("failure".into()), success1, failure1);
-            });
-            assert!(result.is_err());
         }
 
         #[test]