Merge branch 'develop'

Author: pkalivas

Cargo.toml

@@ -50,7 +50,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "1.2.17"
+version = "1.2.18"
 edition = "2024"
 authors = ["pkalivas <peterkalivas@gmail.com>"]
 description = "A Rust library for genetic algorithms and artificial evolution."
@@ -66,16 +66,16 @@ rand = "0.9.2"
 pyo3 = "0.26.0"
 numpy ="0.26.0"
 rayon = "1.11.0"
-serde = { version = "1.0.219", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.143" }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.20", features = ["env-filter", "fmt"] }
-radiate = { version = "1.2.17", path = "crates/radiate", default-features = false }
-radiate-core = { version = "1.2.17", path = "crates/radiate-core", default-features = false }
-radiate-alters = { version = "1.2.17", path = "crates/radiate-alters", default-features = false }
-radiate-selectors = { version = "1.2.17", path = "crates/radiate-selectors", default-features = false }
-radiate-engines = { version = "1.2.17", path = "crates/radiate-engines", default-features = false }
-radiate-gp = { version = "1.2.17", path = "crates/radiate-gp", default-features = false }
-radiate-error = { version = "1.2.17", path = "crates/radiate-error", default-features = false }
-radiate-python = { version = "1.2.17", path = "crates/radiate-python", default-features = false }
+radiate = { version = "1.2.18", path = "crates/radiate", default-features = false }
+radiate-core = { version = "1.2.18", path = "crates/radiate-core", default-features = false }
+radiate-alters = { version = "1.2.18", path = "crates/radiate-alters", default-features = false }
+radiate-selectors = { version = "1.2.18", path = "crates/radiate-selectors", default-features = false }
+radiate-engines = { version = "1.2.18", path = "crates/radiate-engines", default-features = false }
+radiate-gp = { version = "1.2.18", path = "crates/radiate-gp", default-features = false }
+radiate-error = { version = "1.2.18", path = "crates/radiate-error", default-features = false }
+radiate-python = { version = "1.2.18", path = "crates/radiate-python", default-features = false }
 

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

@@ -1,8 +1,13 @@
 use radiate_core::{AlterResult, Chromosome, Crossover, FloatGene, Gene, random_provider};
 
-/// The [BlendCrossover] is a crossover operator that blends the genes of two parent chromosomes
-/// to produce two offspring chromosomes.
-/// This operator is specifically designed for chromosomes containing [FloatGene]s.
+/// The [BlendCrossover] is a crossover operator that blends [FloatGene] alleles from two parent chromosomes to create offspring.
+/// The blending is controlled by the `alpha` parameter, which determines the extent of blending between the two alleles.
+/// The formula used for blending is:
+///
+/// ```text
+/// new_allele_one = allele_one - (alpha * (allele_two - allele_one))
+/// new_allele_two = allele_two - (alpha * (allele_one - allele_two))
+/// ```
 #[derive(Debug, Clone, PartialEq)]
 pub struct BlendCrossover {
     rate: f32,

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

@@ -4,7 +4,6 @@ use std::collections::{HashMap, HashSet};
 // Example: Parents [1,2,3,4,5] and [1,3,5,2,4]
 // Edge table: 1->[2,3], 2->[1,4], 3->[2,5], 4->[5,2], 5->[4,3]
 // Offspring: [1,2,4,5,3] (following edges when possible)
-
 #[derive(Debug, Clone, PartialEq)]
 pub struct EdgeRecombinationCrossover {
     rate: f32,

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

@@ -1,10 +1,10 @@
 use radiate_core::{AlterResult, ArithmeticGene, Chromosome, Crossover, random_provider};
 
-/// The `MeanCrossover` is a simple crossover method that replaces the genes of the first chromosome
+/// The [MeanCrossover] is a simple crossover method that replaces the genes of the first chromosome
 /// with the mean of the two genes. The mean is calculated by adding the two genes together and dividing
 /// by two.
 ///
-/// This crossover can only be used with `ArithmeticGene`s and can be largely benifitial. However, keep
+/// This crossover can only be used with [ArithmeticGene]`s and can be largely benifitial. However, keep
 /// in mind that because we are taking the mean of two genes, this results in children that
 /// converge towards a common distribution. This can be useful in some cases, but it can also
 /// result in a loss of diversity in the population in others.

crates/radiate-core/src/domain/cell.rs

@@ -95,6 +95,7 @@ impl<T> Drop for MutCell<T> {
         if self.consumed {
             return;
         }
+
         unsafe {
             if (*self.inner).ref_count.fetch_sub(1, Ordering::Release) == 1 {
                 std::sync::atomic::fence(Ordering::Acquire);

crates/radiate-core/src/domain/random_provider.rs

@@ -67,6 +67,7 @@ pub fn set_seed(seed: u64) {
 ///
 /// For floating point types, the number will be in the range [0, 1).
 /// For integer types, the number will be in the range [0, MAX).
+#[inline]
 pub fn random<T>() -> T
 where
     T: SampleUniform,
@@ -76,11 +77,13 @@ where
 }
 
 /// Generates a random boolean with the given probability of being true.
+#[inline]
 pub fn bool(prob: f64) -> bool {
     RandomProvider::bool(prob)
 }
 
 /// Generates a random number of type T in the given range.
+#[inline]
 pub fn range<T>(range: std::ops::Range<T>) -> T
 where
     T: SampleUniform + PartialOrd,
@@ -89,13 +92,15 @@ where
 }
 
 /// Chooses a random item from the given slice.
+#[inline]
 pub fn choose<T>(items: &[T]) -> &T {
     let index = range(0..items.len());
     &items[index]
 }
 
 /// Generates a random number from a Gaussian distribution with the given mean and standard deviation.
 /// The Box-Muller transform is used to generate the random number.
+#[inline]
 pub fn gaussian(mean: f64, std_dev: f64) -> f64 {
     let u1: f64 = RandomProvider::random();
     let u2: f64 = RandomProvider::random();
@@ -106,18 +111,21 @@ pub fn gaussian(mean: f64, std_dev: f64) -> f64 {
 }
 
 /// Shuffles the given slice in place.
+#[inline]
 pub fn shuffle<T>(items: &mut [T]) {
     let instance = RandomProvider::global();
     items.shuffle(&mut *instance.rng.lock().unwrap());
 }
 
 /// Generates a vector of indexes from 0 to n-1 in random order.
+#[inline]
 pub fn indexes(range: std::ops::Range<usize>) -> Vec<usize> {
     let mut indexes = range.collect::<Vec<usize>>();
     shuffle(&mut indexes);
     indexes
 }
 
+#[inline]
 pub fn weighted_choice(weights: &[f32]) -> usize {
     let mut rng = RandomProvider::get_rng();
 

crates/radiate-core/src/genome/population.rs

@@ -358,8 +358,9 @@ mod test {
             population[i].set_score(Some(Score::from(i)));
         }
 
-        let mut minimize_population = population.clone();
-        let mut maximize_population = population.clone();
+        // deep clone population
+        let mut minimize_population = Population::from(&population);
+        let mut maximize_population = Population::from(&population);
 
         Optimize::Minimize.sort(&mut minimize_population);
         Optimize::Maximize.sort(&mut maximize_population);

crates/radiate-core/src/stats/distribution.rs

@@ -11,11 +11,13 @@ pub struct Distribution {
 }
 
 impl Distribution {
+    #[inline(always)]
     pub fn push(&mut self, value: f32) {
         self.statistic.add(value);
         self.last_sequence.push(value);
     }
 
+    #[inline(always)]
     pub fn add(&mut self, value: &[f32]) {
         self.clear();
         for v in value {

crates/radiate-core/src/stats/metrics.rs

@@ -108,6 +108,7 @@ impl MetricSet {
         }
     }
 
+    #[inline(always)]
     pub fn merge(&mut self, other: &MetricSet) {
         for (name, metric) in other.iter() {
             if let Some(existing_metric) = self.metrics.get_mut(name) {
@@ -144,6 +145,7 @@ impl MetricSet {
         }
     }
 
+    #[inline(always)]
     pub fn add_labels(&mut self, name: &'static str, labels: Vec<MetricLabel>) {
         if let Some(m) = self.metrics.get_mut(name) {
             for label in labels {
@@ -152,6 +154,7 @@ impl MetricSet {
         }
     }
 
+    #[inline(always)]
     pub fn upsert<'a>(&mut self, name: &'static str, update: impl Into<MetricUpdate<'a>>) {
         if let Some(m) = self.metrics.get_mut(name) {
             m.apply_update(update);
@@ -161,6 +164,7 @@ impl MetricSet {
         }
     }
 
+    #[inline(always)]
     pub fn add_or_update<'a>(&mut self, metric: Metric) {
         if let Some(m) = self.metrics.get_mut(metric.name()) {
             m.apply_update(metric.last_value());
@@ -169,6 +173,7 @@ impl MetricSet {
         }
     }
 
+    #[inline(always)]
     pub fn add(&mut self, metric: Metric) {
         self.metrics.insert(metric.name(), metric);
     }
@@ -282,20 +287,24 @@ impl Metric {
         self.labels.as_ref()
     }
 
+    #[inline(always)]
     pub fn with_labels(mut self, labels: Vec<MetricLabel>) -> Self {
         self.labels.get_or_insert_with(HashSet::new).extend(labels);
         self
     }
 
+    #[inline(always)]
     pub fn add_label(&mut self, label: MetricLabel) {
         self.labels.get_or_insert_with(HashSet::new).insert(label);
     }
 
+    #[inline(always)]
     pub fn upsert<'a>(mut self, update: impl Into<MetricUpdate<'a>>) -> Self {
         self.apply_update(update);
         self
     }
 
+    #[inline(always)]
     pub fn apply_update<'a>(&mut self, update: impl Into<MetricUpdate<'a>>) {
         let update = update.into();
         match update {

crates/radiate-core/src/stats/statistics.rs

@@ -89,6 +89,7 @@ impl Statistic {
         self.sum.value()
     }
 
+    #[inline(always)]
     pub fn variance(&self) -> f32 {
         let mut value = f32::NAN;
         if self.count == 1 {
@@ -100,10 +101,12 @@ impl Statistic {
         value
     }
 
+    #[inline(always)]
     pub fn std_dev(&self) -> f32 {
         self.variance().sqrt()
     }
 
+    #[inline(always)]
     pub fn skewness(&self) -> f32 {
         let mut value = f32::NAN;
         if self.count >= 3 {
@@ -122,6 +125,7 @@ impl Statistic {
         value
     }
 
+    #[inline(always)]
     pub fn kurtosis(&self) -> f32 {
         let mut value = f32::NAN;
         if self.count >= 4 {
@@ -141,6 +145,7 @@ impl Statistic {
         value
     }
 
+    #[inline(always)]
     pub fn add(&mut self, value: f32) {
         self.count += 1;