Fix empty fitnesses to StopCriterion, MutationRate and SelectionRate …

…at the first generation and add several stop criteria
Martin1887 · Dec 27, 2018 · 434f17e · 434f17e
1 parent 916b161
commit 434f17e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/oxigen/Cargo.toml b/oxigen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oxigen"
-version = "1.2.1"
+version = "1.3.0"
 authors = ["Martin1887 <marcos.martin.pozo.delgado@gmail.com>"]
 description = "Fast and parallel genetic algorithm library."
 repository = "https://github.com/Martin1887/oxigen"

diff --git a/oxigen/src/lib.rs b/oxigen/src/lib.rs
@@ -232,6 +232,7 @@ impl<T, Ind: Genotype<T>> GeneticExecution<T, Ind> {
                 .push((Box::new(Ind::generate(&self.genotype_size)), None));
         }
         self.fix();
+        current_fitnesses = self.compute_fitnesses(true);
 
         if self.progress_log.0 > 0 {
             self.print_progress_header();

diff --git a/oxigen/src/stop_criteria.rs b/oxigen/src/stop_criteria.rs
@@ -26,6 +26,15 @@ pub enum StopCriteria {
     Generation(u64),
     /// Stop when the mean progress in the last generations is lower than a specific threshold.
     Progress(f64),
+    /// Stop when the generation is bigger than the first value and the mean progress in the last
+    /// generations is lower than the specific threshold specified as the second value.
+    GenerationAndProgress(u64, f64),
+    /// Stop when the max fitness is bigger or equal than a specific threshold.
+    MaxFitness(f64),
+    /// Stop when the min fitness is bigger or equal than a specific threshold.
+    MinFitness(f64),
+    /// Stop when the average fitness is bigger or equal than a specific threshold.
+    AvgFitness(f64),
 }
 
 impl StopCriterion for StopCriteria {
@@ -34,13 +43,31 @@ impl StopCriterion for StopCriteria {
         generation: u64,
         progress: f64,
         n_solutions: u16,
-        _population_fitness: &[f64],
+        population_fitness: &[f64],
     ) -> bool {
         match self {
             StopCriteria::SolutionFound => n_solutions > 0,
             StopCriteria::SolutionsFound(i) => n_solutions >= *i,
-            StopCriteria::Generation(i) => generation >= *i,
+            StopCriteria::Generation(g) => generation >= *g,
             StopCriteria::Progress(p) => progress <= *p,
+            StopCriteria::GenerationAndProgress(g, p) => generation >= *g && progress <= *p,
+            StopCriteria::MaxFitness(f) => {
+                *population_fitness
+                    .iter()
+                    .max_by(|x, y| x.partial_cmp(&y).unwrap())
+                    .unwrap()
+                    >= *f
+            }
+            StopCriteria::MinFitness(f) => {
+                *population_fitness
+                    .iter()
+                    .min_by(|x, y| x.partial_cmp(&y).unwrap())
+                    .unwrap()
+                    >= *f
+            }
+            StopCriteria::AvgFitness(f) => {
+                population_fitness.iter().sum::<f64>() / population_fitness.len() as f64 >= *f
+            }
         }
     }
 }