Merge pull request #134 from JeroenGar/elim_rand_xoshiro

replace `rand_xoshiro` with `rand`

Author: JeroenGar

.cargo/config.toml

@@ -1,5 +1,5 @@
 # .cargo/config.toml
 [target.wasm32-unknown-unknown]
 rustflags = [
-    "--cfg", "getrandom_backend=\"wasm_js\"", 
-    "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals,+simd128"]
+    "-C", "target-feature=+atomics,+bulk-memory,+mutable-globals,+simd128"
+]

Cargo.toml

@@ -18,7 +18,6 @@ jagua-rs = { features = ["spp"], git = "https://github.com/JeroenGar/jagua-rs.gi
 #jagua-rs = { features = ["spp"], path = "../jagua-rs/jagua-rs" }
 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"] }

src/bench.rs

@@ -16,7 +16,7 @@ use std::time::Duration;
 use anyhow::Result;
 use jagua_rs::io::import::Importer;
 use jagua_rs::io::svg::s_layout_to_svg;
-use rand_xoshiro::Xoshiro256PlusPlus;
+use rand::rngs::Xoshiro256PlusPlus;
 use sparrow::consts::{DEFAULT_COMPRESS_TIME_RATIO, DEFAULT_EXPLORE_TIME_RATIO, DRAW_OPTIONS, LBF_SAMPLE_CONFIG};
 use sparrow::optimizer::compress::compression_phase;
 use sparrow::optimizer::explore::exploration_phase;

src/main.rs

@@ -14,7 +14,7 @@ use std::path::Path;
 use std::time::Duration;
 
 use anyhow::{bail, Result};
-use rand_xoshiro::Xoshiro256PlusPlus;
+use rand::rngs::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::ctrlc_terminator::CtrlCTerminator;
 use sparrow::util::svg_exporter::SvgExporter;

src/optimizer/lbf.rs

@@ -8,9 +8,9 @@ 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 rand::rngs::Xoshiro256PlusPlus;
 
 pub struct LBFBuilder {
     pub instance: SPInstance,

src/optimizer/mod.rs

@@ -9,8 +9,8 @@ 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;
+use rand::rngs::Xoshiro256PlusPlus;
 
 pub mod lbf;
 pub mod separator;

src/optimizer/separator.rs

@@ -13,7 +13,7 @@ use jagua_rs::Instant;
 use log::{debug, log, Level};
 use ordered_float::OrderedFloat;
 use rand::{Rng, RngExt, SeedableRng};
-use rand_xoshiro::Xoshiro256PlusPlus;
+use rand::rngs::Xoshiro256PlusPlus;
 use rayon::iter::IntoParallelRefMutIterator;
 use rayon::iter::ParallelIterator;
 use rayon::ThreadPool;

src/optimizer/worker.rs

@@ -10,9 +10,9 @@ 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::rngs::Xoshiro256PlusPlus;
 use tap::Tap;
 
 pub struct SeparatorWorker {

src/sample/uniform_sampler.rs

@@ -7,8 +7,7 @@ use jagua_rs::geometry::{normalize_rotation, DTransformation, Transformation};
 use ndarray::Array;
 use ordered_float::OrderedFloat;
 use rand::prelude::IndexedRandom;
-use rand::RngExt;
-use rand_xoshiro::rand_core::Rng;
+use rand::{Rng, RngExt};
 use std::f32::consts::PI;
 use std::ops::Range;
 

tests/tests.rs

@@ -2,8 +2,6 @@
 mod integration_tests {
     use anyhow::Result;
     use jagua_rs::io::import::Importer;
-    use rand::SeedableRng;
-    use rand_xoshiro::Xoshiro256PlusPlus;
     use sparrow::config::DEFAULT_SPARROW_CONFIG;
     use sparrow::consts::LBF_SAMPLE_CONFIG;
     use sparrow::optimizer::compress::compression_phase;
@@ -15,6 +13,8 @@ mod integration_tests {
     use sparrow::util::terminator::Terminator;
     use std::path::Path;
     use std::time::Duration;
+    use rand::rngs::Xoshiro256PlusPlus;
+    use rand::SeedableRng;
     use test_case::test_case;
     use sparrow::util::listener::DummySolListener;