Drop on_fitness_complete and after_fitness_complete hooks as these are practically next to on_generation_complete and after_generation_complete

Author: basvanwesting

examples/evolve_custom_extension.rs

@@ -69,8 +69,8 @@ impl Extension for MultiPointExtension {
 
     // After mutation: Default Noop
 
-    // After fitness: Remove duplicates if too many
-    fn after_fitness_complete<R: Rng, SR: StrategyReporter<Genotype = Self::Genotype>>(
+    // After generation: Remove duplicates if too many
+    fn after_generation_complete<R: Rng, SR: StrategyReporter<Genotype = Self::Genotype>>(
         &mut self,
         genotype: &mut Self::Genotype,
         state: &mut EvolveState<Self::Genotype>,
@@ -85,7 +85,7 @@ impl Extension for MultiPointExtension {
 
             if duplicate_ratio > 0.5 {
                 println!(
-                    "After fitness: High duplication ratio ({:.2}%), removing duplicates",
+                    "After generation: High duplication ratio ({:.2}%), removing duplicates",
                     duplicate_ratio * 100.0
                 );
 
@@ -103,25 +103,6 @@ impl Extension for MultiPointExtension {
             }
         }
     }
-
-    // After generation: Summary statistics
-    fn after_generation_complete<R: Rng, SR: StrategyReporter<Genotype = Self::Genotype>>(
-        &mut self,
-        _genotype: &mut Self::Genotype,
-        state: &mut EvolveState<Self::Genotype>,
-        _config: &EvolveConfig,
-        _reporter: &mut SR,
-        _rng: &mut R,
-    ) {
-        if state.current_generation() % 100 == 0 {
-            println!(
-                "Generation {}: Best fitness: {:?}, Cardinality: {:?}",
-                state.current_generation(),
-                state.best_fitness_score(),
-                state.population_cardinality()
-            );
-        }
-    }
 }
 
 fn main() {

src/extension.rs

@@ -45,7 +45,6 @@ pub type ExtensionAllele<E> = <<E as Extension>::Genotype as Genotype>::Allele;
 /// * `after_selection_complete`
 /// * `after_crossover_complete`
 /// * `after_mutation_complete`
-/// * `after_fitness_complete`
 /// * `after_generation_complete`
 ///
 /// For backward compatibility, the `call` method delegates to `after_selection_complete` by default.
@@ -150,17 +149,6 @@ pub trait Extension: Clone + Send + Sync + std::fmt::Debug {
         // Default no-op implementation
     }
 
-    fn after_fitness_complete<R: Rng, SR: StrategyReporter<Genotype = Self::Genotype>>(
-        &mut self,
-        _genotype: &mut Self::Genotype,
-        _state: &mut EvolveState<Self::Genotype>,
-        _config: &EvolveConfig,
-        _reporter: &mut SR,
-        _rng: &mut R,
-    ) {
-        // Default no-op implementation
-    }
-
     fn after_generation_complete<R: Rng, SR: StrategyReporter<Genotype = Self::Genotype>>(
         &mut self,
         _genotype: &mut Self::Genotype,

src/extension/wrapper.rs

@@ -129,32 +129,6 @@ impl<G: EvolveGenotype> Extension for Wrapper<G> {
             }
         }
     }
-    fn after_fitness_complete<R: Rng, SR: StrategyReporter<Genotype = G>>(
-        &mut self,
-        genotype: &mut G,
-        state: &mut EvolveState<G>,
-        config: &EvolveConfig,
-        reporter: &mut SR,
-        rng: &mut R,
-    ) {
-        match self {
-            Wrapper::MassDeduplication(extension) => {
-                extension.after_fitness_complete(genotype, state, config, reporter, rng)
-            }
-            Wrapper::MassDegeneration(extension) => {
-                extension.after_fitness_complete(genotype, state, config, reporter, rng)
-            }
-            Wrapper::MassExtinction(extension) => {
-                extension.after_fitness_complete(genotype, state, config, reporter, rng)
-            }
-            Wrapper::MassGenesis(extension) => {
-                extension.after_fitness_complete(genotype, state, config, reporter, rng)
-            }
-            Wrapper::Noop(extension) => {
-                extension.after_fitness_complete(genotype, state, config, reporter, rng)
-            }
-        }
-    }
     fn after_generation_complete<R: Rng, SR: StrategyReporter<Genotype = G>>(
         &mut self,
         genotype: &mut G,

src/strategy.rs

@@ -272,7 +272,6 @@ pub trait StrategyState<G: Genotype>: Display {
 ///     * `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`
@@ -405,13 +404,6 @@ pub trait StrategyReporter: Clone + Send + Sync {
         _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,

src/strategy/evolve.rs

@@ -61,7 +61,8 @@ pub enum EvolveVariant {
 /// * setup
 /// * [reporter](crate::strategy::reporter) on_start hook
 /// * loop while not finished
-///   * (before selection) increment generation & filter by age
+///   * increment generation
+///   * (before selection) filter by age
 ///   * [select](crate::select)
 ///   * (after selection) update population cardinality
 ///   * [reporter](crate::strategy::reporter) on_selection_complete hook
@@ -74,8 +75,6 @@ pub enum EvolveVariant {
 ///   * [reporter](crate::strategy::reporter) on_mutation_complete hook
 ///   * [extension](crate::extension) after_mutation_complete hook
 ///   * [fitness](crate::fitness) calculation
-///   * [reporter](crate::strategy::reporter) on_fitness_complete hook
-///   * [extension](crate::extension) after_fitness_complete hook
 ///   * store best chromosome
 ///   * [reporter](crate::strategy::reporter) on_generation_complete hook
 ///   * [extension](crate::extension) after_generation_complete hook
@@ -337,16 +336,6 @@ 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,
-                &self.config,
-                &mut self.reporter,
-                &mut self.rng,
-            );
-
             self.state.update_best_chromosome_and_report(
                 &self.genotype,
                 &self.config,

src/strategy/hill_climb.rs

@@ -228,8 +228,6 @@ 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,
@@ -252,8 +250,6 @@ 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,8 +235,6 @@ 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,
@@ -270,8 +268,6 @@ 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(