Improve global fluency

Author: Fantomas42

term_timer/server/templates/session.html

@@ -829,7 +829,7 @@ <h2 class="card-title">
                 {% endif %}
               </td>
               <td class="solve-fluency">
-                {% set fluency = solve.compute_fluency(solve.solution) %}
+                {% set fluency = solve.fluency %}
                 {% if fluency %}
                   <span class="metric-{% if fluency >= 75 %}success{% elif fluency >= 50 %}caution{% else %}warning{% endif %}">
                     {{ fluency }}%

term_timer/server/templates/solve.html

@@ -478,8 +478,8 @@
              annotation: {
                annotations: [{
                  type: 'line',
-                 yMin: {{ solve.compute_fluency(solve.solution) }},
-                 yMax: {{ solve.compute_fluency(solve.solution) }},
+                 yMin: {{ solve.fluency }},
+                 yMax: {{ solve.fluency }},
                  borderColor: 'rgba(255, 0, 0, 0.6)',
                  borderWidth: 2,
                }],
@@ -791,7 +791,7 @@ <h2 class="card-title">
         <div class="stat-card">
           <div class="stat-title">Fluency</div>
           <div class="stat-value">
-            {% set fluency = solve.compute_fluency(solve.solution) %}
+            {% set fluency = solve.fluency %}
             <span class="metric-{% if fluency >= 75 %}success{% elif fluency >= 50 %}caution{% else %}warning{% endif %}">
               {{ fluency }}%
             </span>

term_timer/solve.py

@@ -294,6 +294,21 @@ def reconstruction(self) -> Algorithm:
             translate_moves(self.orientation_moves)(self.solution),
         )
 
+    @cached_property
+    def fluency(self) -> int:
+        """
+        Calculate overall fluency for the solve.
+
+        Returns:
+            Fluency score (0-100), or 0 if ≤2 moves
+
+        """
+        return self.compute_fluency(
+            translate_moves(self.orientation_moves)(self.solution).transform(
+                optimize_double_moves,
+            ),
+        )
+
     @cached_property
     def tps(self) -> float:
         """
@@ -550,9 +565,8 @@ def report_line(self) -> str:
             pause_line = '[success]No Pauses[/success]'
 
         fluency_line = ''
-        fluency = self.compute_fluency(self.solution)
-        if fluency > 0:
-            fluency_line += format_fluency(fluency)
+        if self.fluency > 0:
+            fluency_line += format_fluency(self.fluency)
 
         rotation_line = ''
         if self.rotations:
@@ -623,10 +637,9 @@ def trainer_line(self) -> str:
                 f' [caution]{ self.rotations } Rotations[/caution]'
             )
 
-        fluency = self.compute_fluency(self.reconstruction)
         fluency_line = ''
-        if fluency > 0:
-            fluency_line = f'{ format_fluency(fluency) } '
+        if self.fluency > 0:
+            fluency_line = f'{ format_fluency(self.fluency) } '
 
         return (
             f'{ metric_string }'
@@ -1040,7 +1053,7 @@ def fluency_graph(self) -> None:
             label='Fluency',
             color=129,
         )
-        plt.hline(self.compute_fluency(self.solution), 'red')
+        plt.hline(self.fluency, 'red')
         plt.plot_size(height=20)
         plt.canvas_color('default')
         plt.axes_color('default')

term_timer/stats.py

@@ -990,7 +990,7 @@ def detail(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915
             console.print(missed_string)
 
             fluency_string = '[stats]Fluency    :[/stats] '
-            fluency = solve.compute_fluency(solve.solution)
+            fluency = solve.fluency
 
             if fluency > 0:
                 fluency_string += format_fluency(fluency)