Merge branch 'develop'

Author: pkalivas

Cargo.toml

@@ -71,7 +71,7 @@ rayon = "1.11.0"
 smallvec = { version = "1.13", features = ["serde"] }
 thiserror = "2.0.17"
 serde = { version = "1.0.228", features = ["derive", "rc"] }
-serde_json = { version = "1.0.148" }
+serde_json = { version = "1.0.149" }
 chrono = { version = "0.4.42", default-features = false, features = ["std"] }
 chrono-tz = "0.10"
 compact_str = { version = "0.9.0" }

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Radiate</h1>
 <p align="center">
-  <img src="/docs/assets/radiate.png" height="100" width="60" alt="Radiate Logo" />
+  <img src="/docs/assets/logo/radiate.png" height="100" width="60" alt="Radiate Logo" />
 </p>
 
 <div align="center">

crates/radiate-core/src/alter.rs

@@ -2,7 +2,7 @@ use crate::{Chromosome, Gene, Genotype, Metric, Population, math::indexes, rando
 use crate::{Rate, metric};
 use radiate_utils::{ToSnakeCase, intern};
 use std::iter::once;
-use std::rc::Rc;
+use std::sync::Arc;
 
 #[macro_export]
 macro_rules! alters {
@@ -82,8 +82,8 @@ impl From<Metric> for AlterResult {
 
 #[derive(Clone)]
 pub enum Alterer<C: Chromosome> {
-    Mutate(&'static str, Rate, Rc<dyn Mutate<C>>),
-    Crossover(&'static str, Rate, Rc<dyn Crossover<C>>),
+    Mutate(&'static str, Rate, Arc<dyn Mutate<C>>),
+    Crossover(&'static str, Rate, Arc<dyn Crossover<C>>),
 }
 
 impl<C: Chromosome> Alterer<C> {
@@ -105,31 +105,47 @@ impl<C: Chromosome> Alterer<C> {
     pub fn alter(&self, population: &mut Population<C>, generation: usize) -> Vec<Metric> {
         match &self {
             Alterer::Mutate(name, rate, m) => {
-                let rate_value = rate.value(generation);
+                let (rate_value, rate_metric) = Self::rate_metric(generation, rate, name);
 
                 let timer = std::time::Instant::now();
                 let AlterResult(count, metrics) = m.mutate(population, generation, rate_value);
                 let metric = metric!(name, (count, timer.elapsed()));
 
                 match metrics {
-                    Some(metrics) => metrics.into_iter().chain(once(metric)).collect(),
-                    None => vec![metric],
+                    Some(metrics) => metrics
+                        .into_iter()
+                        .chain(once(metric))
+                        .chain(once(rate_metric))
+                        .collect(),
+                    None => vec![metric, rate_metric],
                 }
             }
             Alterer::Crossover(name, rate, c) => {
-                let rate_value = rate.value(generation);
+                let (rate_value, rate_metric) = Self::rate_metric(generation, rate, name);
 
                 let timer = std::time::Instant::now();
                 let AlterResult(count, metrics) = c.crossover(population, generation, rate_value);
                 let metric = metric!(name, (count, timer.elapsed()));
 
                 match metrics {
-                    Some(metrics) => metrics.into_iter().chain(once(metric)).collect(),
-                    None => vec![metric],
+                    Some(metrics) => metrics
+                        .into_iter()
+                        .chain(once(metric))
+                        .chain(once(rate_metric))
+                        .collect(),
+                    None => vec![metric, rate_metric],
                 }
             }
         }
     }
+
+    #[inline]
+    fn rate_metric(generation: usize, rate: &Rate, name: &str) -> (f32, Metric) {
+        let rate_value = rate.value(generation);
+        let metric = metric!(radiate_utils::intern!(format!("{}_rate", name)), rate_value);
+
+        (rate_value, metric)
+    }
 }
 
 /// Minimum population size required to perform crossover - this ensures that there
@@ -168,7 +184,7 @@ pub trait Crossover<C: Chromosome>: Send + Sync {
     where
         Self: Sized + 'static,
     {
-        Alterer::Crossover(intern!(self.name()), self.rate(), Rc::new(self))
+        Alterer::Crossover(intern!(self.name()), self.rate(), Arc::new(self))
     }
 
     #[inline]
@@ -266,7 +282,7 @@ pub trait Mutate<C: Chromosome>: Send + Sync {
     where
         Self: Sized + 'static,
     {
-        Alterer::Mutate(intern!(self.name()), self.rate(), Rc::new(self))
+        Alterer::Mutate(intern!(self.name()), self.rate(), Arc::new(self))
     }
 
     #[inline]

crates/radiate-core/src/objectives/optimize.rs

@@ -2,6 +2,9 @@ use super::Scored;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
+const MIN: &str = "min";
+const MAX: &str = "max";
+
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Objective {
@@ -132,6 +135,27 @@ impl Default for Objective {
     }
 }
 
+impl From<Vec<&str>> for Objective {
+    fn from(values: Vec<&str>) -> Self {
+        let opts: Vec<Optimize> = values.into_iter().map(|s| Optimize::from(s)).collect();
+
+        if opts.len() == 1 {
+            Objective::Single(opts[0])
+        } else {
+            Objective::Multi(opts)
+        }
+    }
+}
+
+impl Into<Vec<&str>> for Objective {
+    fn into(self) -> Vec<&'static str> {
+        match self {
+            Objective::Single(opt) => vec![opt.into()],
+            Objective::Multi(opts) => opts.into_iter().map(|opt| opt.into()).collect(),
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Optimize {
@@ -170,6 +194,25 @@ impl Optimize {
     }
 }
 
+impl From<&str> for Optimize {
+    fn from(value: &str) -> Self {
+        match value.to_lowercase().as_str() {
+            MIN => Optimize::Minimize,
+            MAX => Optimize::Maximize,
+            _ => Optimize::Maximize,
+        }
+    }
+}
+
+impl Into<&str> for Optimize {
+    fn into(self) -> &'static str {
+        match self {
+            Optimize::Minimize => MIN,
+            Optimize::Maximize => MAX,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;