Improve F2L sloting

Author: Fantomas42

term_timer/methods/cfop.py

@@ -26,6 +26,14 @@
     'F2L Back Right': f2l_case_encoder(F2L_BL_MASK),
 }
 
+# Anticipated compensation order
+# because check_step will perform computing using opposite top face
+# but keep front face, which rotate the cube like a z2 rotation.
+F2L_SLOTS = [
+    'Front Left', 'Front Right',
+    'Back Left', 'Back Right',
+]
+
 
 class CFOPAnalyser(Analyser):
     """
@@ -332,15 +340,11 @@ def compute_progress(self, facelets: str,
 
         if not self.check_step('OLL', facelets, self.orientation_faces):
             name = ['F2L 1', 'F2L 2', 'F2L 3', 'F2L 4']
-            # Anticipated compensation
-            # because check_step will perform computing using opposite top face
-            # but keep front face, which rotate the cube like a z2 rotation.
-            pair = ['Front Left', 'Front Right', 'Back Left', 'Back Right']
 
             score = 1
             pairs: list[str] = []
 
-            for n, p in zip(name, pair, strict=True):
+            for n, p in zip(name, F2L_SLOTS, strict=True):
                 result = self.check_step(n, facelets, self.orientation_faces)
                 if result:
                     score += 1
@@ -393,12 +397,37 @@ def correct_summary(self, summary: list[StepSummary]) -> None:  # noqa: C901, PL
                 if 'OLL' in info['name']:
                     info['name'] = 'F2L 4'
                     info['case_infos'] = sorted(
-                        {
-                            'Front Left', 'Front Right',
-                            'Back Left', 'Back Right',
-                        } - set(case_infos),
+                        set(F2L_SLOTS) - set(case_infos),
                     )
 
+        # Merge remaining F2L pairs into the last F2L entry
+        f2l_covered: set[int] = set()
+        last_f2l_idx = -1
+
+        for i, info in enumerate(summary):
+            if 'Cross' in info['name']:
+                f2l_covered.update(range(1, info['name'].count('X') + 1))
+            elif 'F2L ' in info['name']:
+                last_f2l_idx = i
+                for part in info['name'].replace('F2L ', '').split('+'):
+                    if part.isdigit():
+                        f2l_covered.add(int(part))
+
+        if last_f2l_idx >= 0 and len(f2l_covered) < 4:
+            last = summary[last_f2l_idx]
+            missing = sorted({1, 2, 3, 4} - f2l_covered)
+            if missing:
+                current = [
+                    int(p)
+                    for p in last['name'].replace('F2L ', '').split('+')
+                    if p.isdigit()
+                ]
+                all_nums = sorted(current + missing)
+                last['name'] = 'F2L ' + '+'.join(map(str, all_nums))
+                last['case_infos'] = sorted(
+                    set(F2L_SLOTS) - set(case_infos),
+                )
+
         self.correct_summary_cfop(summary)
 
         if 'Cross' not in summary[0]['name']:

term_timer/tests/test_solve_108.py

@@ -52,7 +52,7 @@ def test_summary(self) -> None:
         outputs = [
             ('XXCross', 'step'),
             ('F2L', 'virtual'),
-            ('F2L 4', 'substep'),
+            ('F2L 3+4', 'substep'),
             ('OLL', 'skipped'),
             ('PLL', 'step'),
         ]

term_timer/tests/test_solve_32.py

@@ -193,3 +193,70 @@ def test_summary(self) -> None:
                     source['type'],
                     expected[1],
                 )
+
+
+class TestSolve32RFOrientationCF4OP(TestSolve32):
+    """Test Solve with broken result for checking output in CF4OP."""
+
+    def setUp(self) -> None:
+        """Test setup."""
+        super().setUp()
+        self.solve.method_name = 'cf4op'
+        self.solve.orientation = 'RF'
+
+    def test_summary(self) -> None:
+        """Test summary."""
+        method_applied = get_method_applied(self.solve)
+        inputs = method_applied.summary
+        outputs = [
+            ('Cross', 'step'),
+            ('F2L', 'virtual'),
+            ('F2L 1+2', 'substep'),
+            ('F2L 3+4', 'substep'),
+            ('OLL', 'skipped'),
+            ('PLL', 'skipped'),
+        ]
+
+        for source, expected in zip(inputs, outputs, strict=True):
+            with self.subTest(name=source['name']):
+                self.assertEqual(
+                    source['name'],
+                    expected[0],
+                )
+                self.assertEqual(
+                    source['type'],
+                    expected[1],
+                )
+
+
+class TestSolve32UROrientationCF4OP(TestSolve32):
+    """Test Solve with broken result for checking output in CF4OP."""
+
+    def setUp(self) -> None:
+        """Test setup."""
+        super().setUp()
+        self.solve.method_name = 'cf4op'
+        self.solve.orientation = 'UR'
+
+    def test_summary(self) -> None:
+        """Test summary."""
+        method_applied = get_method_applied(self.solve)
+        inputs = method_applied.summary
+        outputs = [
+            ('XCross', 'step'),
+            ('F2L', 'virtual'),
+            ('F2L 2+3+4', 'substep'),
+            ('OLL', 'skipped'),
+            ('PLL', 'skipped'),
+        ]
+
+        for source, expected in zip(inputs, outputs, strict=True):
+            with self.subTest(name=source['name']):
+                self.assertEqual(
+                    source['name'],
+                    expected[0],
+                )
+                self.assertEqual(
+                    source['type'],
+                    expected[1],
+                )