Add best fitness log message

reinterpretcat · Oct 7, 2024 · 6355721 · 6355721
1 parent fd3d623
commit 6355721
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/experiments/etc/shared.py b/experiments/etc/shared.py
@@ -62,9 +62,9 @@ def solve_scientific(self, scientific_format, problem_path, config_path, solutio
                 raise ValueError('cannot get solution statistic')
 
             # expected:
-            # fitness: (0.000, 92.000, 53389.603),
+            # best fitness: (0.000, 92.000, 53389.603),
             for best in re.finditer(
-                    r"fitness: \((?P<unassigned>[\d.]+),?\s*(?P<tours>[\d.]+)?\s*, (?P<cost>[\d.]+)\)",
+                    r"best fitness: \((?P<unassigned>[\d.]+),?\s*(?P<tours>[\d.]+)?\s*, (?P<cost>[\d.]+)\)",
                     p.stdout):
                 pass
 

diff --git a/rosomaxa/src/evolution/telemetry.rs b/rosomaxa/src/evolution/telemetry.rs
@@ -269,6 +269,11 @@ where
         let speed = generations as Float / self.time.elapsed_secs_as_float();
 
         self.log(format!("[{elapsed}s] total generations: {generations}, speed: {speed:.2} gen/sec",).as_str());
+        if let Some(best) = population.ranked().next() {
+            self.log(format!("\tbest fitness: ({})", format_fitness(best.fitness())).as_str());
+        } else {
+            self.log("no solutions found");
+        }
 
         self.metrics.duration = elapsed;
         self.metrics.speed = speed;