Merge pull request #132 from JeroenGar/rand-0.10

JeroenGar · web-flow · commit c95454e39027 · 2026-02-11T09:21:41.000+01:00
rand 0.10 and optimized imports
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,10 +14,11 @@ name = "bench"
 path = "src/bench.rs"
 
 [dependencies]
-jagua-rs = { features = ["spp"], git = "https://github.com/JeroenGar/jagua-rs.git", rev = "76aab0fa70688ee50d1809f5376f71c758ea0b7c"}
+jagua-rs = { features = ["spp"], git = "https://github.com/JeroenGar/jagua-rs.git", rev = "ba38bcae9ed3ab41a9e93a1894e2b01ea87c6619"}
 #jagua-rs = { features = ["spp"], path = "../jagua-rs/jagua-rs" }
-rand = "0.9"
-rand_distr = "0.5"
+rand = "0.10"
+rand_distr = "0.6"
+rand_xoshiro = "0.8"
 svg = "0.18"
 itertools = "0.14"
 log = { version = "0.4", features = ["release_max_level_info"] }
@@ -36,9 +37,8 @@ test-case = "3.3"
 clap = { version = "4.5", features = ["derive"] }
 anyhow = "1.0"
 ndarray = "0.17"
-rand_xoshiro = "0.7"
 
-getrandom = { version = "0.3", features = ["wasm_js"] }
+getrandom = { version = "0.4", features = ["wasm_js"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 ctrlc = "3.4"
diff --git a/src/bench.rs b/src/bench.rs
@@ -1,8 +1,9 @@
 extern crate core;
 use sparrow::util::terminator::Terminator;
 
+use jagua_rs::Instant;
 use ordered_float::OrderedFloat;
-use rand::{Rng, RngCore, SeedableRng};
+use rand::{Rng, RngExt, SeedableRng};
 use sparrow::config::*;
 use sparrow::optimizer::lbf::LBFBuilder;
 use sparrow::optimizer::separator::Separator;
@@ -11,7 +12,6 @@ use std::env::args;
 use std::fs;
 use std::path::Path;
 use std::time::Duration;
-use jagua_rs::Instant;
 
 use anyhow::Result;
 use jagua_rs::io::import::Importer;
diff --git a/src/consts.rs b/src/consts.rs
@@ -1,5 +1,5 @@
-use jagua_rs::io::svg::{SvgDrawOptions, SvgLayoutTheme};
 use crate::sample::search::SampleConfig;
+use jagua_rs::io::svg::{SvgDrawOptions, SvgLayoutTheme};
 
 pub const GLS_WEIGHT_MAX_INC_RATIO: f32 = 2.0;
 pub const GLS_WEIGHT_MIN_INC_RATIO: f32 = 1.2;
diff --git a/src/eval/lbf_evaluator.rs b/src/eval/lbf_evaluator.rs
@@ -1,10 +1,10 @@
-use jagua_rs::collision_detection::hazards::filter::NoFilter;
 use crate::eval::sample_eval::{SampleEval, SampleEvaluator};
+use jagua_rs::collision_detection::hazards::filter::NoFilter;
 use jagua_rs::entities::Item;
 use jagua_rs::entities::Layout;
-use jagua_rs::geometry::DTransformation;
 use jagua_rs::geometry::geo_traits::TransformableFrom;
 use jagua_rs::geometry::primitives::SPolygon;
+use jagua_rs::geometry::DTransformation;
 
 pub const X_MULTIPLIER: f32 = 10.0;
 pub const Y_MULTIPLIER: f32 = 1.0;
diff --git a/src/eval/sep_evaluator.rs b/src/eval/sep_evaluator.rs
@@ -1,12 +1,12 @@
-use jagua_rs::collision_detection::hazards::collector::HazardCollector;
 use crate::eval::sample_eval::{SampleEval, SampleEvaluator};
 use crate::eval::specialized_jaguars_pipeline::{collect_poly_collisions_in_detector_custom, SpecializedHazardCollector};
 use crate::quantify::tracker::CollisionTracker;
+use jagua_rs::collision_detection::hazards::collector::HazardCollector;
 use jagua_rs::entities::Item;
 use jagua_rs::entities::Layout;
 use jagua_rs::entities::PItemKey;
-use jagua_rs::geometry::DTransformation;
 use jagua_rs::geometry::primitives::SPolygon;
+use jagua_rs::geometry::DTransformation;
 
 pub struct SeparationEvaluator<'a> {
     layout: &'a Layout,
diff --git a/src/eval/specialized_jaguars_pipeline.rs b/src/eval/specialized_jaguars_pipeline.rs
@@ -1,4 +1,3 @@
-use std::f32::consts::PI;
 use crate::quantify::quantify_collision_poly_container;
 #[cfg(not(feature = "simd"))]
 use crate::quantify::quantify_collision_poly_poly;
@@ -10,16 +9,17 @@ use crate::quantify::tracker::CollisionTracker;
 use crate::util::assertions;
 use crate::util::bit_reversal_iterator::BitReversalIterator;
 use float_cmp::approx_eq;
-use jagua_rs::collision_detection::CDEngine;
 use jagua_rs::collision_detection::hazards::collector::HazardCollector;
 use jagua_rs::collision_detection::hazards::{HazKey, HazardEntity};
 use jagua_rs::collision_detection::quadtree::QTHazPresence;
+use jagua_rs::collision_detection::CDEngine;
 use jagua_rs::entities::Layout;
 use jagua_rs::entities::PItemKey;
-use jagua_rs::geometry::DTransformation;
-use jagua_rs::geometry::geo_traits::{TransformableFrom};
+use jagua_rs::geometry::geo_traits::TransformableFrom;
 use jagua_rs::geometry::primitives::SPolygon;
+use jagua_rs::geometry::DTransformation;
 use slotmap::SecondaryMap;
+use std::f32::consts::PI;
 
 /// Functionally identical to [`CDEngine::collect_poly_collisions`], but with early return.
 /// Collision collection will stop as soon as the loss exceeds the `loss_bound` of the detector.
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,9 +2,9 @@
 #![allow(const_item_mutation)]
 #![allow(unused_imports)]
 
-use std::sync::LazyLock;
-use numfmt::{Formatter, Precision, Scales};
 use jagua_rs::Instant;
+use numfmt::{Formatter, Precision, Scales};
+use std::sync::LazyLock;
 
 pub mod optimizer;
 pub mod quantify;
diff --git a/src/main.rs b/src/main.rs
@@ -1,23 +1,23 @@
 extern crate core;
 
 use clap::Parser as Clap;
+use jagua_rs::io::import::Importer;
 use log::{info, warn, Level};
 use rand::SeedableRng;
 use sparrow::config::*;
 use sparrow::optimizer::optimize;
 use sparrow::util::io;
-use sparrow::util::io::{MainCli, ExtSPOutput};
+use sparrow::util::io::{ExtSPOutput, MainCli};
+use sparrow::EPOCH;
 use std::fs;
 use std::path::Path;
 use std::time::Duration;
-use jagua_rs::io::import::Importer;
-use sparrow::EPOCH;
 
 use anyhow::{bail, Result};
 use rand_xoshiro::Xoshiro256PlusPlus;
 use sparrow::consts::{DEFAULT_COMPRESS_TIME_RATIO, DEFAULT_EXPLORE_TIME_RATIO, DEFAULT_FAIL_DECAY_RATIO_CMPR, DEFAULT_MAX_CONSEQ_FAILS_EXPL, LOG_LEVEL_FILTER_DEBUG, LOG_LEVEL_FILTER_RELEASE};
-use sparrow::util::svg_exporter::SvgExporter;
 use sparrow::util::ctrlc_terminator::CtrlCTerminator;
+use sparrow::util::svg_exporter::SvgExporter;
 
 pub const OUTPUT_DIR: &str = "output";
 
diff --git a/src/optimizer/compress.rs b/src/optimizer/compress.rs
@@ -1,11 +1,11 @@
-use jagua_rs::Instant;
-use jagua_rs::probs::spp::entities::{SPInstance, SPSolution};
-use log::info;
-use rand::Rng;
 use crate::config::{CompressionConfig, ShrinkDecayStrategy};
 use crate::optimizer::separator::Separator;
 use crate::util::listener::{ReportType, SolutionListener};
 use crate::util::terminator::Terminator;
+use jagua_rs::probs::spp::entities::{SPInstance, SPSolution};
+use jagua_rs::Instant;
+use log::info;
+use rand::{Rng, RngExt};
 
 /// Algorithm 13 from https://doi.org/10.48550/arXiv.2509.13329
 pub fn compression_phase(
diff --git a/src/optimizer/explore.rs b/src/optimizer/explore.rs
@@ -1,4 +1,9 @@
-use std::cmp::Reverse;
+use crate::config::ExplorationConfig;
+use crate::optimizer::separator::{Separator, SeparatorConfig};
+use crate::sample::uniform_sampler::convert_sample_to_closest_feasible;
+use crate::util::listener::{ReportType, SolutionListener};
+use crate::util::terminator::Terminator;
+use crate::FMT;
 use float_cmp::approx_eq;
 use itertools::Itertools;
 use jagua_rs::collision_detection::hazards::HazardEntity;
@@ -10,12 +15,7 @@ use ordered_float::OrderedFloat;
 use rand::prelude::{Distribution, IteratorRandom};
 use rand_distr::Normal;
 use slotmap::SecondaryMap;
-use crate::config::ExplorationConfig;
-use crate::FMT;
-use crate::optimizer::separator::{Separator, SeparatorConfig};
-use crate::sample::uniform_sampler::convert_sample_to_closest_feasible;
-use crate::util::listener::{ReportType, SolutionListener};
-use crate::util::terminator::Terminator;
+use std::cmp::Reverse;
 
 /// Algorithm 12 from https://doi.org/10.48550/arXiv.2509.13329
 pub fn exploration_phase(instance: &SPInstance, sep: &mut Separator, sol_listener: &mut impl SolutionListener, term: &impl Terminator, config: &ExplorationConfig) -> Vec<SPSolution> {
diff --git a/src/optimizer/lbf.rs b/src/optimizer/lbf.rs
@@ -1,16 +1,16 @@
 use crate::eval::lbf_evaluator::LBFEvaluator;
 use crate::eval::sample_eval::SampleEval;
 use crate::sample::search::{search_placement, SampleConfig};
+use crate::util::assertions;
 use itertools::Itertools;
+use jagua_rs::entities::Instance;
+use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem};
+use jagua_rs::Instant;
 use log::debug;
 use ordered_float::OrderedFloat;
+use rand_xoshiro::Xoshiro256PlusPlus;
 use std::cmp::Reverse;
 use std::iter;
-use jagua_rs::Instant;
-use jagua_rs::entities::Instance;
-use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem};
-use rand_xoshiro::Xoshiro256PlusPlus;
-use crate::util::assertions;
 
 pub struct LBFBuilder {
     pub instance: SPInstance,
diff --git a/src/optimizer/mod.rs b/src/optimizer/mod.rs
@@ -1,16 +1,16 @@
 use crate::config::*;
-use crate::optimizer::lbf::LBFBuilder;
-use crate::optimizer::separator::Separator;
-use jagua_rs::probs::spp::entities::{SPInstance, SPSolution};
-use rand::{RngCore, SeedableRng};
-use std::time::Duration;
-use log::info;
-use rand_xoshiro::Xoshiro256PlusPlus;
 use crate::consts::LBF_SAMPLE_CONFIG;
 use crate::optimizer::compress::compression_phase;
 use crate::optimizer::explore::exploration_phase;
+use crate::optimizer::lbf::LBFBuilder;
+use crate::optimizer::separator::Separator;
 use crate::util::listener::{ReportType, SolutionListener};
 use crate::util::terminator::Terminator;
+use jagua_rs::probs::spp::entities::{SPInstance, SPSolution};
+use log::info;
+use rand::{Rng, SeedableRng};
+use rand_xoshiro::Xoshiro256PlusPlus;
+use std::time::Duration;
 
 pub mod lbf;
 pub mod separator;
diff --git a/src/optimizer/separator.rs b/src/optimizer/separator.rs
@@ -3,20 +3,20 @@ use crate::optimizer::Terminator;
 use crate::quantify::tracker::{CTSnapshot, CollisionTracker};
 use crate::sample::search::SampleConfig;
 use crate::util::assertions::tracker_matches_layout;
-use crate::{FMT};
+use crate::util::listener::{ReportType, SolutionListener};
+use crate::FMT;
 use itertools::Itertools;
 use jagua_rs::entities::PItemKey;
-use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem, SPSolution};
 use jagua_rs::geometry::DTransformation;
+use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem, SPSolution};
+use jagua_rs::Instant;
 use log::{debug, log, Level};
 use ordered_float::OrderedFloat;
-use rand::{Rng, SeedableRng};
+use rand::{Rng, RngExt, SeedableRng};
+use rand_xoshiro::Xoshiro256PlusPlus;
 use rayon::iter::IntoParallelRefMutIterator;
 use rayon::iter::ParallelIterator;
 use rayon::ThreadPool;
-use jagua_rs::Instant;
-use rand_xoshiro::Xoshiro256PlusPlus;
-use crate::util::listener::{ReportType, SolutionListener};
 
 #[derive(Debug, Clone, Copy)]
 pub struct SeparatorConfig {
diff --git a/src/optimizer/worker.rs b/src/optimizer/worker.rs
@@ -6,13 +6,13 @@ use crate::util::assertions::tracker_matches_layout;
 use crate::FMT;
 use itertools::Itertools;
 use jagua_rs::entities::{Instance, PItemKey};
-use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem, SPSolution};
 use jagua_rs::geometry::DTransformation;
+use jagua_rs::probs::spp::entities::{SPInstance, SPPlacement, SPProblem, SPSolution};
 use log::debug;
 use rand::prelude::SliceRandom;
+use rand_xoshiro::Xoshiro256PlusPlus;
 use std::iter::Sum;
 use std::ops::AddAssign;
-use rand_xoshiro::Xoshiro256PlusPlus;
 use tap::Tap;
 
 pub struct SeparatorWorker {
diff --git a/src/quantify/mod.rs b/src/quantify/mod.rs
@@ -1,7 +1,7 @@
-use jagua_rs::geometry::geo_traits::DistanceTo;
-use jagua_rs::geometry::primitives::{Rect, SPolygon};
 use crate::consts::OVERLAP_PROXY_EPSILON_DIAM_RATIO;
 use crate::quantify::overlap_proxy::overlap_area_proxy;
+use jagua_rs::geometry::geo_traits::DistanceTo;
+use jagua_rs::geometry::primitives::{Rect, SPolygon};
 
 pub mod overlap_proxy;
 mod pair_matrix;
diff --git a/src/quantify/overlap_proxy.rs b/src/quantify/overlap_proxy.rs
@@ -1,6 +1,6 @@
-use std::f32::consts::PI;
 use jagua_rs::geometry::fail_fast::SPSurrogate;
 use jagua_rs::geometry::geo_traits::DistanceTo;
+use std::f32::consts::PI;
 
 /// Calculates a proxy for the overlap area between two simple polygons (using poles).
 /// Algorithm 3 from https://doi.org/10.48550/arXiv.2509.13329
diff --git a/src/quantify/simd/overlap_proxy_simd.rs b/src/quantify/simd/overlap_proxy_simd.rs
@@ -1,12 +1,12 @@
 use crate::quantify::overlap_proxy::overlap_area_proxy;
 use crate::quantify::simd::circles_soa::CirclesSoA;
 use float_cmp::approx_eq;
-use std::simd::Simd;
-use std::simd::Select;
 use jagua_rs::geometry::fail_fast::SPSurrogate;
 use jagua_rs::geometry::geo_traits::DistanceTo;
 use jagua_rs::geometry::primitives::{Circle, Point};
 use std::f32::consts::PI;
+use std::simd::Select;
+use std::simd::Simd;
 
 /// Width of the SIMD vector
 const SIMD_WIDTH: usize = 4;
diff --git a/src/quantify/tracker.rs b/src/quantify/tracker.rs
@@ -1,10 +1,10 @@
-use jagua_rs::collision_detection::hazards::collector::{BasicHazardCollector, HazardCollector};
-use jagua_rs::collision_detection::hazards::HazardEntity;
-use jagua_rs::entities::{Layout, PItemKey};
 use crate::consts::{GLS_WEIGHT_DECAY, GLS_WEIGHT_MAX_INC_RATIO, GLS_WEIGHT_MIN_INC_RATIO};
 use crate::quantify::pair_matrix::PairMatrix;
 use crate::quantify::{quantify_collision_poly_container, quantify_collision_poly_poly};
 use crate::util::assertions::tracker_matches_layout;
+use jagua_rs::collision_detection::hazards::collector::{BasicHazardCollector, HazardCollector};
+use jagua_rs::collision_detection::hazards::HazardEntity;
+use jagua_rs::entities::{Layout, PItemKey};
 use ordered_float::Float;
 use slotmap::SecondaryMap;
 
diff --git a/src/sample/coord_descent.rs b/src/sample/coord_descent.rs
@@ -2,7 +2,7 @@ use crate::consts::{CD_STEP_FAIL, CD_STEP_SUCCESS};
 use crate::eval::sample_eval::{SampleEval, SampleEvaluator};
 use jagua_rs::geometry::DTransformation;
 use log::trace;
-use rand::Rng;
+use rand::{Rng, RngExt};
 use std::cmp::Ordering;
 use std::fmt::Debug;
 
diff --git a/src/sample/search.rs b/src/sample/search.rs
@@ -1,11 +1,11 @@
-use jagua_rs::entities::{Item, Layout, PItemKey};
-use jagua_rs::geometry::DTransformation;
-use jagua_rs::geometry::geo_enums::RotationRange;
-use crate::consts::{SND_REFINE_CD_TL_RATIOS, PRE_REFINE_CD_TL_RATIOS, UNIQUE_SAMPLE_THRESHOLD, PRE_REFINE_CD_R_STEPS, SND_REFINE_CD_R_STEPS};
+use crate::consts::{PRE_REFINE_CD_R_STEPS, PRE_REFINE_CD_TL_RATIOS, SND_REFINE_CD_R_STEPS, SND_REFINE_CD_TL_RATIOS, UNIQUE_SAMPLE_THRESHOLD};
 use crate::eval::sample_eval::{SampleEval, SampleEvaluator};
 use crate::sample::best_samples::BestSamples;
 use crate::sample::coord_descent::{refine_coord_desc, CDConfig};
 use crate::sample::uniform_sampler::UniformBBoxSampler;
+use jagua_rs::entities::{Item, Layout, PItemKey};
+use jagua_rs::geometry::geo_enums::RotationRange;
+use jagua_rs::geometry::DTransformation;
 use log::debug;
 use rand::Rng;
 
diff --git a/src/sample/uniform_sampler.rs b/src/sample/uniform_sampler.rs
@@ -1,15 +1,16 @@
-use std::f32::consts::PI;
 use itertools::Itertools;
+use jagua_rs::entities::Item;
 use jagua_rs::geometry::geo_enums::RotationRange;
 use jagua_rs::geometry::geo_traits::TransformableFrom;
-use rand::prelude::IndexedRandom;
-use rand::Rng;
-use std::ops::Range;
-use jagua_rs::entities::Item;
 use jagua_rs::geometry::primitives::Rect;
 use jagua_rs::geometry::{normalize_rotation, DTransformation, Transformation};
 use ndarray::Array;
-use ordered_float::{OrderedFloat};
+use ordered_float::OrderedFloat;
+use rand::prelude::IndexedRandom;
+use rand::RngExt;
+use rand_xoshiro::rand_core::Rng;
+use std::f32::consts::PI;
+use std::ops::Range;
 
 const ROT_N_SAMPLES: usize = 16; // number of rotations to sample for continuous rotation
 
diff --git a/src/util/assertions.rs b/src/util/assertions.rs
@@ -3,15 +3,15 @@ use crate::quantify::tracker::CollisionTracker;
 use crate::quantify::{quantify_collision_poly_container, quantify_collision_poly_poly};
 use float_cmp::{approx_eq, assert_approx_eq};
 use itertools::Itertools;
-use jagua_rs::util::assertions;
-use log::warn;
-use std::collections::HashSet;
 use jagua_rs::collision_detection::hazards::collector::{BasicHazardCollector, HazardCollector};
 use jagua_rs::collision_detection::hazards::HazardEntity;
 use jagua_rs::entities::Layout;
 use jagua_rs::geometry::primitives::SPolygon;
 use jagua_rs::io::svg::SvgDrawOptions;
 use jagua_rs::probs::spp::entities::SPProblem;
+use jagua_rs::util::assertions;
+use log::warn;
+use std::collections::HashSet;
 
 pub fn tracker_matches_layout(ct: &CollisionTracker, l: &Layout) -> bool {
     assert!(l.placed_items.keys().all(|k| ct.pk_idx_map.contains_key(k)));
diff --git a/src/util/ctrlc_terminator.rs b/src/util/ctrlc_terminator.rs
diff --git a/src/util/io.rs b/src/util/io.rs
diff --git a/src/util/svg_exporter.rs b/src/util/svg_exporter.rs
diff --git a/src/util/terminator.rs b/src/util/terminator.rs
