Solver::NAME -> Solver::name()

Author: Joris Bayer

crates/argmin/src/core/executor.rs

@@ -179,7 +179,8 @@ where
                 let kv = kv.unwrap_or(kv![]);
 
                 // Observe after init
-                self.observers.observe_init(S::NAME, &state, &kv)?;
+                self.observers
+                    .observe_init(self.solver.name(), &state, &kv)?;
             }
 
             state.func_counts(&self.problem);
@@ -680,7 +681,9 @@ mod tests {
             P: Clone,
             F: ArgminFloat,
         {
-            const NAME: &'static str = "OptimizationAlgorithm";
+            fn name(&self) -> &str {
+                "OptimizationAlgorithm"
+            }
 
             // Only resets internal_state to 1
             fn init(

crates/argmin/src/core/result.rs

@@ -124,7 +124,7 @@ where
 {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         writeln!(f, "OptimizationResult:")?;
-        writeln!(f, "    Solver:        {}", S::NAME)?;
+        writeln!(f, "    Solver:        {}", self.solver.name())?;
         writeln!(
             f,
             "    param (best):  {}",

crates/argmin/src/core/solver.rs

@@ -33,7 +33,7 @@ use crate::core::{Error, Problem, State, TerminationReason, TerminationStatus, K
 ///     P: Clone,
 ///     F: ArgminFloat
 /// {
-///     const NAME: &'static str = "OptimizationAlgorithm";
+///     fn name(&self) -> &str { "OptimizationAlgorithm" }
 ///
 ///     fn init(
 ///         &mut self,
@@ -64,7 +64,7 @@ use crate::core::{Error, Problem, State, TerminationReason, TerminationStatus, K
 /// ```
 pub trait Solver<O, I: State> {
     /// Name of the solver. Mainly used in [Observers](`crate::core::observers::Observe`).
-    const NAME: &'static str;
+    fn name(&self) -> &str;
 
     /// Initializes the algorithm.
     ///

crates/argmin/src/core/test_utils.rs

@@ -327,7 +327,9 @@ impl TestSolver {
 }
 
 impl<O> Solver<O, IterState<Vec<f64>, (), (), (), (), f64>> for TestSolver {
-    const NAME: &'static str = "TestSolver";
+    fn name(&self) -> &str {
+        "TestSolver"
+    }
 
     fn next_iter(
         &mut self,

crates/argmin/src/solver/brent/brentopt.rs

@@ -102,7 +102,9 @@ where
     O: CostFunction<Param = F, Output = F>,
     F: ArgminFloat,
 {
-    const NAME: &'static str = "BrentOpt";
+    fn name(&self) -> &str {
+        "BrentOpt"
+    }
 
     fn init(
         &mut self,

crates/argmin/src/solver/brent/brentroot.rs

@@ -80,7 +80,9 @@ where
     O: CostFunction<Param = F, Output = F>,
     F: ArgminFloat,
 {
-    const NAME: &'static str = "BrentRoot";
+    fn name(&self) -> &str {
+        "BrentRoot"
+    }
 
     fn init(
         &mut self,

crates/argmin/src/solver/conjugategradient/cg.rs

@@ -91,7 +91,9 @@ where
     R: ArgminMul<F, R> + ArgminMul<F, P> + ArgminConj + ArgminDot<R, F> + ArgminScaledAdd<P, F, R>,
     F: ArgminFloat + ArgminL2Norm<F>,
 {
-    const NAME: &'static str = "Conjugate Gradient";
+    fn name(&self) -> &str {
+        "Conjugate Gradient"
+    }
 
     fn init(
         &mut self,

crates/argmin/src/solver/conjugategradient/nonlinear_cg.rs

@@ -128,7 +128,9 @@ where
     B: NLCGBetaUpdate<G, P, F>,
     F: ArgminFloat,
 {
-    const NAME: &'static str = "Nonlinear Conjugate Gradient";
+    fn name(&self) -> &str {
+        "Nonlinear Conjugate Gradient"
+    }
 
     fn init(
         &mut self,

crates/argmin/src/solver/gaussnewton/gaussnewton_linesearch.rs

@@ -96,7 +96,9 @@ where
     F: ArgminFloat,
     R: Clone,
 {
-    const NAME: &'static str = "Gauss-Newton method with line search";
+    fn name(&self) -> &str {
+        "Gauss-Newton method with line search"
+    }
 
     fn next_iter(
         &mut self,

crates/argmin/src/solver/gaussnewton/gaussnewton_method.rs

@@ -122,7 +122,9 @@ where
         + ArgminDot<P, P>,
     F: ArgminFloat,
 {
-    const NAME: &'static str = "Gauss-Newton method";
+    fn name(&self) -> &str {
+        "Gauss-Newton method"
+    }
 
     fn init(
         &mut self,