balanced_vrp_clustering 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9295e785852bb79697a072224baa660c51ddd34e26b0d9aab44b86a9dcf5914
-  data.tar.gz: 52a0f93de2790c9d1a72930e7bf9b08a6990564b54276bc34ec888a13364ea79
+  metadata.gz: d40ecf7603eecf4a910d260b048a0995ef083693d86ca1505a8917e307b77f48
+  data.tar.gz: 2c341e23ec935338655142e1c91f2af52946c4e0e73b496c114bf3a512dc081a
 SHA512:
-  metadata.gz: d918f9ce687c8bc7693847df479961069f1687f76c86802485a6c741510125a5d6469df29dffca991a2b0ddb30617d4ed2c400c6495f7eca8a3f816c9e6675a3
-  data.tar.gz: c4eb9ca4b0b4df36736d221d7f879f1adb9e96d349c3f5ff6a87c9ad9cae0b4b2cee96b796258fc0f7e93c154602e0e88361703726e9903b7c154dabc4651f55
+  metadata.gz: e77d2b9e506296f6bbda1018fb539d1e63a3b9a4e6b5fab51435fc9bbe875babbc6a22e4ea690c73e9915d15e4285e51f9f4b2e592dfd1544ab2c9cd9231eb0f
+  data.tar.gz: fb314cc636d27e43963960fd61fc768a91078b9bf6611bec47c9feaf51bd684a67a6e557a8e268ab2e3ccab50e54dc3a5d86d2ff11c42700ef735004d8fd8e98

data/rust/Cargo.lock

@@ -78,7 +78,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "balanced_vrp_clustering_core"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "approx",
  "clap",
@@ -90,7 +90,7 @@ dependencies = [
 
 [[package]]
 name = "balanced_vrp_clustering_native"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "balanced_vrp_clustering_core",
  "magnus",

data/rust/balanced_vrp_clustering_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "balanced_vrp_clustering_core"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 description = "Rust core for balanced VRP k-means clustering"
 license = "AGPL-3.0-or-later"

data/rust/balanced_vrp_clustering_core/src/clusterer.rs

@@ -184,7 +184,7 @@ impl Clusterer {
         }
     }
 
-    pub fn build(mut self) -> BuildOutput {
+    pub fn build(mut self) -> Result<BuildOutput, String> {
         let started = Instant::now();
         connect_linked_items(&mut self.items, &self.related_item_indices);
 
@@ -200,7 +200,7 @@ impl Clusterer {
         self.strict_limitations = strict;
         self.cut_limit = cut_lim;
 
-        self.calc_initial_centroids();
+        self.calc_initial_centroids()?;
         self.prepare_balancing();
 
         self.mark_items_at_top();
@@ -217,11 +217,11 @@ impl Clusterer {
             .map(|c| c.iter().map(|&i| self.items[i].id.clone()).collect())
             .collect();
 
-        BuildOutput {
+        Ok(BuildOutput {
             iterations: self.iteration,
             clusters,
             elapsed_ms: started.elapsed().as_millis() as u64,
-        }
+        })
     }
 
     fn init_unit_symbols(&mut self) {
@@ -560,7 +560,7 @@ impl Clusterer {
         }
     }
 
-    fn calc_initial_centroids(&mut self) {
+    fn calc_initial_centroids(&mut self) -> Result<(), String> {
         self.centroids.clear();
         self.old_centroids_lat_lon.clear();
         let mut remaining_skills: Vec<Vehicle> = self.vehicles.clone();
@@ -616,14 +616,25 @@ impl Clusterer {
             for (ind, &index) in self.centroid_indices.iter().enumerate() {
                 let skills = remaining_skills.remove(0);
                 let item = &self.items[index];
+                let mut linked_conflict: Option<usize> = None;
                 do_forall_linked(&self.items, index, |li| {
-                    if insert_at_beginning.contains(&li) {
-                        panic!("Centroid linked conflict");
+                    if linked_conflict.is_none() {
+                        if let Some(used_at) = insert_at_beginning.iter().position(|&x| x == li) {
+                            linked_conflict = Some(used_at);
+                        }
                     }
                 });
+                if let Some(used_at) = linked_conflict {
+                    return Err(format!(
+                        "Centroid {ind} is initialised with a service which has a linked service that is used to initialise centroid {used_at}"
+                    ));
+                }
                 let vehicle_centroid = vehicle_as_centroid_props(&skills);
                 if !compatible_item_centroid(item, &vehicle_centroid) {
-                    panic!("Incompatible centroid init");
+                    // Mirror Ruby populate_centroids ArgumentError message.
+                    return Err(format!(
+                        "Centroid {ind} is initialised with an incompatible service -- {index}"
+                    ));
                 }
                 let mut centroid = vehicle_centroid;
                 centroid.lat = item.lat;
@@ -643,6 +654,7 @@ impl Clusterer {
             c.capacity_offence_coeff = 0.0;
             c.route_time = 0.0;
         }
+        Ok(())
     }
 
     fn move_item_to_front(&mut self, item_idx: usize) {
@@ -1275,6 +1287,6 @@ fn default_day_skills() -> Vec<String> {
         .collect()
 }
 
-pub fn build_from_input(input: &InputConfig) -> BuildOutput {
+pub fn build_from_input(input: &InputConfig) -> Result<BuildOutput, String> {
     Clusterer::from_input(input).build()
 }

data/rust/balanced_vrp_clustering_core/src/main.rs

@@ -36,7 +36,7 @@ fn main() {
     let cli = Cli::parse();
     let json = fs::read_to_string(&cli.input).expect("read input");
     let input: InputConfig = serde_json::from_str(&json).expect("parse input");
-    let result = build_from_input(&input);
+    let result = build_from_input(&input).unwrap_or_else(|e| panic!("{e}"));
     let out_json = serde_json::to_string_pretty(&result).expect("serialize output");
     if let Some(path) = cli.output {
         fs::write(path, out_json).expect("write output");

data/rust/balanced_vrp_clustering_core/tests/integration.rs

@@ -30,7 +30,7 @@ fn golden_tiny_builds() {
     }
     let json = fs::read_to_string(path).expect("read tiny.json");
     let input: InputConfig = serde_json::from_str(&json).expect("parse");
-    let output = build_from_input(&input);
+    let output = build_from_input(&input).expect("build");
     assert_eq!(output.clusters.len(), 2);
     assert_eq!(
         output.clusters.iter().map(|c| c.len()).sum::<usize>(),

data/rust/balanced_vrp_clustering_native/Cargo.toml

@@ -18,7 +18,7 @@
 
 [package]
 name = "balanced_vrp_clustering_native"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 description = "Ruby native extension for balanced VRP clustering"
 license = "AGPL-3.0-or-later"

data/rust/balanced_vrp_clustering_native/src/lib.rs

@@ -32,7 +32,8 @@ fn build_from_json(input: RString) -> Result<RString, Error> {
         )
     })?;
 
-    let output = build_from_input(&config);
+    let output = build_from_input(&config)
+        .map_err(|e| Error::new(ruby.exception_arg_error(), e))?;
     let out_json = serde_json::to_string(&output).map_err(|e| {
         Error::new(
             ruby.exception_runtime_error(),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balanced_vrp_clustering
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Cartoway