Add on_crossover_complete, on_mutation_complete and on_fitness_complete to StrategyReporter as well

Hook on_crossover_complete and on_mutation_complete to Evolve strategy
Hook on_fitness_complete to all strategies

Author: basvanwesting

src/strategy.rs

@@ -269,8 +269,11 @@ pub trait StrategyState<G: Genotype>: Display {
 /// * `on_enter` (before setup)
 /// * `on_start` (of run loop)
 /// * *in run loop:*
-///     * `on_generation_complete`
 ///     * `on_selection_complete` (for Evolve only, as it is a more interesting point in the loop)
+///     * `on_crossover_complete` (for Evolve only, for completeness)
+///     * `on_mutation_complete` (for Evolve only, for completeness)
+///     * `on_fitness_complete` (for completeness)
+///     * `on_generation_complete`
 ///     * `on_new_best_chromosome`
 ///     * `on_new_best_chromosome_equal_fitness`
 ///     * `on_select_event`
@@ -381,14 +384,35 @@ pub trait StrategyReporter: Clone + Send + Sync {
         _config: &C,
     ) {
     }
-    fn on_generation_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
+    fn on_selection_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
         &mut self,
         _genotype: &Self::Genotype,
         _state: &S,
         _config: &C,
     ) {
     }
-    fn on_selection_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
+    fn on_crossover_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
+        &mut self,
+        _genotype: &Self::Genotype,
+        _state: &S,
+        _config: &C,
+    ) {
+    }
+    fn on_mutation_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
+        &mut self,
+        _genotype: &Self::Genotype,
+        _state: &S,
+        _config: &C,
+    ) {
+    }
+    fn on_fitness_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
+        &mut self,
+        _genotype: &Self::Genotype,
+        _state: &S,
+        _config: &C,
+    ) {
+    }
+    fn on_generation_complete<S: StrategyState<Self::Genotype>, C: StrategyConfig>(
         &mut self,
         _genotype: &Self::Genotype,
         _state: &S,

src/strategy/evolve.rs

@@ -124,11 +124,11 @@ pub enum EvolveVariant {
 /// [StrategyReporter] (e.g. [EvolveReporterDuration], [EvolveReporterSimple]). But you are encouraged to
 /// roll your own, see [StrategyReporter].
 ///
-/// For [Evolve] the reporting has an additional `on_selection_complete` hook, because
-/// that is a more interesting point in the loop, as the population and cardinality are refreshed
-/// after selection.
-/// The `on_generation_complete` contains all the new mutations, most of which will be immediately
-/// selected out. This gives the false impression of good cardinality while there is actually little.
+/// For [Evolve] the reporting has an additional `on_selection_complete` hook, because that is a
+/// more interesting point in the loop, as the population and cardinality are refreshed after
+/// selection. As the `on_generation_complete` contains all the new mutations, most of which will
+/// be immediately selected out. This gives the false impression of good cardinality while there is
+/// actually little.
 ///
 /// From the [EvolveBuilder] level, there are several calling mechanisms:
 /// * [call](EvolveBuilder::call): this runs a single evolve strategy
@@ -306,6 +306,8 @@ impl<
                 &mut self.reporter,
                 &mut self.rng,
             );
+            self.reporter
+                .on_crossover_complete(&self.genotype, &self.state, &self.config);
             self.plugins.extension.after_crossover_complete(
                 &mut self.genotype,
                 &mut self.state,
@@ -321,6 +323,8 @@ impl<
                 &mut self.reporter,
                 &mut self.rng,
             );
+            self.reporter
+                .on_mutation_complete(&self.genotype, &self.state, &self.config);
             self.plugins.extension.after_mutation_complete(
                 &mut self.genotype,
                 &mut self.state,
@@ -335,6 +339,8 @@ impl<
                 &self.config,
                 fitness_thread_local.as_ref(),
             );
+            self.reporter
+                .on_fitness_complete(&self.genotype, &self.state, &self.config);
             self.plugins.extension.after_fitness_complete(
                 &mut self.genotype,
                 &mut self.state,

src/strategy/hill_climb.rs

@@ -228,6 +228,8 @@ impl<G: HillClimbGenotype, F: Fitness<Genotype = G>, SR: StrategyReporter<Genoty
                         &mut self.state,
                         &self.config,
                     );
+                    self.reporter
+                        .on_fitness_complete(&self.genotype, &self.state, &self.config);
                     self.state.update_best_chromosome_from_state_chromosome(
                         &self.genotype,
                         &self.config,
@@ -250,6 +252,8 @@ impl<G: HillClimbGenotype, F: Fitness<Genotype = G>, SR: StrategyReporter<Genoty
                         &self.config,
                         fitness_thread_local.as_ref(),
                     );
+                    self.reporter
+                        .on_fitness_complete(&self.genotype, &self.state, &self.config);
                     self.state.update_best_chromosome_from_state_population(
                         &self.genotype,
                         &self.config,

src/strategy/permutate.rs

@@ -235,6 +235,8 @@ impl<G: PermutateGenotype, F: Fitness<Genotype = G>, SR: StrategyReporter<Genoty
                     &mut self.state,
                     &self.config,
                 );
+                self.reporter
+                    .on_fitness_complete(&self.genotype, &self.state, &self.config);
                 self.state.update_best_chromosome_and_report(
                     &self.genotype,
                     &self.config,
@@ -268,6 +270,8 @@ impl<G: PermutateGenotype, F: Fitness<Genotype = G>, SR: StrategyReporter<Genoty
             });
 
             receiver.iter().for_each(|(chromosome, fitness_duration)| {
+                self.reporter
+                    .on_fitness_complete(&self.genotype, &self.state, &self.config);
                 self.state.increment_generation();
                 self.state.chromosome.replace(chromosome);
                 self.state.update_best_chromosome_and_report(