Merge branch 'develop'

Author: pkalivas

Cargo.toml

@@ -66,7 +66,9 @@ rand = "0.9.2"
 pyo3 = "0.27.1"
 numpy ="0.27.0"
 rayon = "1.11.0"
-serde = { version = "1.0.228", features = ["derive"] }
+smallvec = { version = "1.13", features = ["serde"] }
+thiserror = "2.0.17"
+serde = { version = "1.0.228", features = ["derive", "rc"] }
 serde_json = { version = "1.0.143" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.20", features = ["env-filter", "fmt"] }

crates/radiate-alters/src/crossovers/blend.rs

@@ -43,7 +43,7 @@ where
         let mut cross_count = 0;
 
         for i in 0..std::cmp::min(chrom_one.len(), chrom_two.len()) {
-            if random_provider::random::<f32>() < rate {
+            if random_provider::bool(rate) {
                 let gene_one = chrom_one.get(i);
                 let gene_two = chrom_two.get(i);
 

crates/radiate-alters/src/crossovers/intermediate.rs

@@ -42,7 +42,7 @@ impl<C: Chromosome<Gene = FloatGene>> Crossover<C> for IntermediateCrossover {
         let mut cross_count = 0;
 
         for i in 0..std::cmp::min(chrom_one.len(), chrom_two.len()) {
-            if random_provider::random::<f32>() < rate {
+            if random_provider::bool(rate) {
                 let gene_one = chrom_one.get_mut(i);
                 let gene_two = chrom_two.get_mut(i);
 

crates/radiate-alters/src/crossovers/mean.rs

@@ -37,7 +37,7 @@ where
         let mut count = 0;
 
         for (gene_one, gene_two) in chrom_one.iter_mut().zip(chrom_two.iter()) {
-            if random_provider::random::<f32>() < rate {
+            if random_provider::bool(rate) {
                 *gene_one = gene_one.mean(gene_two);
                 count += 1;
             }

crates/radiate-alters/src/crossovers/multipoint.rs

@@ -51,7 +51,7 @@ pub fn crossover_multi_point<G>(
         return 0;
     }
 
-    let mut crossover_points = random_provider::indexes(0..length);
+    let mut crossover_points = random_provider::shuffled_indices(0..length);
 
     let selected_points = &mut crossover_points[..num_points];
     selected_points.sort();

crates/radiate-alters/src/crossovers/shuffle.rs

@@ -19,10 +19,10 @@ impl<C: Chromosome + Clone> Crossover<C> for ShuffleCrossover {
     fn cross_chromosomes(&self, chrom_one: &mut C, chrom_two: &mut C, _: f32) -> AlterResult {
         let length = std::cmp::min(chrom_one.len(), chrom_two.len());
         if length < 2 {
-            return 0.into();
+            return AlterResult::empty();
         }
 
-        let mut indices: Vec<usize> = (0..length).collect();
+        let mut indices = (0..length).collect::<Vec<usize>>();
         random_provider::shuffle(&mut indices);
 
         let temp_chrom_one = chrom_one.clone();
@@ -37,6 +37,6 @@ impl<C: Chromosome + Clone> Crossover<C> for ShuffleCrossover {
             }
         }
 
-        cross_count.into()
+        AlterResult::from(cross_count)
     }
 }

crates/radiate-alters/src/crossovers/simulated_binary.rs

@@ -8,7 +8,7 @@ pub struct SimulatedBinaryCrossover {
 }
 
 impl SimulatedBinaryCrossover {
-    pub fn new(contiguty: f32, crossover_rate: f32) -> Self {
+    pub fn new(crossover_rate: f32, contiguty: f32) -> Self {
         Self {
             contiguty,
             crossover_rate,
@@ -26,7 +26,7 @@ impl<C: Chromosome<Gene = FloatGene>> Crossover<C> for SimulatedBinaryCrossover
         let length = std::cmp::min(chrom_one.len(), chrom_two.len());
 
         if length < 2 {
-            return 0.into();
+            return AlterResult::empty();
         }
 
         let mut count = 0;
@@ -57,6 +57,6 @@ impl<C: Chromosome<Gene = FloatGene>> Crossover<C> for SimulatedBinaryCrossover
             }
         }
 
-        count.into()
+        AlterResult::from(count)
     }
 }

crates/radiate-alters/src/mutators/arithmetic.rs

@@ -36,7 +36,7 @@ impl<G: ArithmeticGene, C: Chromosome<Gene = G>> Mutate<C> for ArithmeticMutator
     fn mutate_chromosome(&self, chromosome: &mut C, rate: f32) -> AlterResult {
         let mut mutations = 0;
         for gene in chromosome.iter_mut() {
-            if random_provider::random::<f32>() < rate {
+            if random_provider::bool(rate) {
                 let operator = random_provider::range(0..4);
 
                 let new_gene = match operator {
@@ -52,6 +52,6 @@ impl<G: ArithmeticGene, C: Chromosome<Gene = G>> Mutate<C> for ArithmeticMutator
             }
         }
 
-        mutations.into()
+        AlterResult::from(mutations)
     }
 }

crates/radiate-alters/src/mutators/gaussian.rs

@@ -31,7 +31,7 @@ impl<C: Chromosome<Gene = FloatGene>> Mutate<C> for GaussianMutator {
     fn mutate_chromosome(&self, chromosome: &mut C, rate: f32) -> AlterResult {
         let mut count = 0;
         for gene in chromosome.genes_mut() {
-            if random_provider::random::<f32>() < rate {
+            if random_provider::bool(rate) {
                 let min = *gene.min() as f64;
                 let max = *gene.max() as f64;
 
@@ -47,6 +47,6 @@ impl<C: Chromosome<Gene = FloatGene>> Mutate<C> for GaussianMutator {
             }
         }
 
-        count.into()
+        AlterResult::from(count)
     }
 }

crates/radiate-alters/src/mutators/invert.rs

@@ -30,14 +30,14 @@ impl<C: Chromosome> Mutate<C> for InversionMutator {
     fn mutate_chromosome(&self, chromosome: &mut C, rate: f32) -> AlterResult {
         let mut mutations = 0;
 
-        if random_provider::random::<f32>() < rate {
+        if random_provider::bool(rate) {
             let start = random_provider::range(0..chromosome.len());
             let end = random_provider::range(start..chromosome.len());
 
             chromosome.genes_mut()[start..end].reverse();
             mutations += 1;
         }
 
-        mutations.into()
+        AlterResult::from(mutations)
     }
 }