Skip to content

Commit cd1d303

Browse files
Fantomas42Fantomas42
committed
Disable pre-AUF for F2L
1 parent 7e6515d commit cd1d303

File tree

3 files changed

+20
-25
lines changed

3 files changed

+20
-25
lines changed

‎term_timer/methods/cfop.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class CFOPAnalyser(Analyser):
1212
name = 'CFOP'
1313
step_list = ('Cross', 'F2L', 'OLL', 'PLL')
1414
aufs: ClassVar[dict[str, list[bool]]] = {
15-
'F2L': [True, False],
1615
'OLL': [True, False],
1716
'PLL': [True, True],
1817
}
@@ -241,10 +240,6 @@ class CF4OPAnalyser(CFOPAnalyser):
241240
name = 'CF4OP'
242241
step_list = ('Cross', 'F2L 1', 'F2L 2', 'F2L 3', 'F2L 4', 'OLL', 'PLL')
243242
aufs: ClassVar[dict[str, list[bool]]] = {
244-
'F2L 1': [True, False],
245-
'F2L 2': [True, False],
246-
'F2L 3': [True, False],
247-
'F2L 4': [True, False],
248243
'OLL': [True, True],
249244
'PLL': [True, True],
250245
}

‎term_timer/tests/test_solve_38.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,22 +250,22 @@ def test_reconstruction_step_line(self):
250250
outputs = [
251251
"B L' [pause].[/pause] U F2 [reco-pause].[/reco-pause]",
252252

253-
"[pre-auf]U2[/pre-auf] [pair-ie]B U B'[/pair-ie] "
253+
"U2 [pair-ie]B U B'[/pair-ie] "
254254
"[deletion]U'[/deletion] "
255255
"[pause].[/pause] [deletion]U[/deletion] "
256256
"[pair-ie]R' U' R[/pair-ie] "
257257
"U2 [pair-ie]L U L'[/pair-ie] [reco-pause].[/reco-pause]",
258258

259-
"[pre-auf]U[/pre-auf] [pause].[/pause] "
260-
"[pre-auf]U[/pre-auf] R' U [sa]R U' R' U'[/sa] "
259+
"U [pause].[/pause] "
260+
"U R' U [sa]R U' R' U'[/sa] "
261261
"R [reco-pause].[/reco-pause]",
262262

263263
"[pair-ie]R U R'[/pair-ie] [deletion]U'[/deletion] "
264264
"[pause].[/pause] [deletion]U[/deletion] U' "
265265
"[pause].[/pause] [ne]F U2 F'[/ne] "
266266
"U2 [pair-ie]F U' F'[/pair-ie] [reco-pause].[/reco-pause]",
267267

268-
"[pre-auf]U2[/pre-auf] [pause].[/pause] "
268+
"U2 [pause].[/pause] "
269269
"F' U [sa]F U' F' U'[/sa] F [reco-pause].[/reco-pause]",
270270

271271
"[pre-auf]U'[/pre-auf] [pause].[/pause] "
@@ -299,14 +299,14 @@ def test_reconstruction_step_line_multiple(self):
299299
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause] "
300300
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
301301

302-
"[pre-auf]U2[/pre-auf] [pair-ie]B U B'[/pair-ie] "
302+
"U2 [pair-ie]B U B'[/pair-ie] "
303303
"[deletion]U'[/deletion] "
304304
"[pause].[/pause] [deletion]U[/deletion] "
305305
"[addition].[/addition] [pair-ie]R' U' R[/pair-ie] "
306306
"U2 [pair-ie]L U L'[/pair-ie] [reco-pause].[/reco-pause]",
307307

308-
"[pre-auf]U[/pre-auf] [pause].[/pause] "
309-
"[pre-auf]U[/pre-auf] R' U [sa]R U' R' U'[/sa] "
308+
"U [pause].[/pause] "
309+
"U R' U [sa]R U' R' U'[/sa] "
310310
"R [reco-pause].[/reco-pause]",
311311

312312
"[pair-ie]R U R'[/pair-ie] [deletion]U'[/deletion] "
@@ -316,7 +316,7 @@ def test_reconstruction_step_line_multiple(self):
316316
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause] "
317317
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
318318

319-
"[pre-auf]U2[/pre-auf] [pause].[/pause] "
319+
"U2 [pause].[/pause] "
320320
"F' U [sa]F U' F' U'[/sa] F "
321321
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
322322

@@ -398,13 +398,13 @@ def test_reconstruction_step_text_multiple(self):
398398

399399
def test_link_alg_cubing(self):
400400
self.assertIn(
401-
'&alg=z2_%2F%2F_Orientation%0AB_L-_._._U_F2_._._._._%2F%2F_Cross_Reco:_0.00s_Exec:_1.89s_HTM:_4_%0AU2_B_U_B-_U-_._U_R-_U-_R_U2_L_U_L-_._%2F%2F_F2L_1_(BL)_Reco:_2.34s_Exec:_4.20s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_._U_R-_U_R_U-_R-_U-_R_._%2F%2F_F2L_2_(BR)_Reco:_0.96s_Exec:_2.46s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B2%0AR_U_R-_U-_._._U_U-_._F_U2_F-_U2_F_U-_F-_._._._._%2F%2F_F2L_3_(FL)_Reco:_0.66s_Exec:_3.66s_HTM:_13_%0AU2_._F-_U_F_U-_F-_U-_F_._._%2F%2F_F2L_4_(FR)_Reco:_2.16s_Exec:_2.28s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU-_._U-_._M_L-_U2_L_U_L-_U_L_U_M-_._%2F%2F_OLL_(10_Anti-Kite)_Reco:_1.20s_Exec:_3.39s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_R-_U-_F-_R_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_U_R_U2_%2F%2F_PLL_(F)_Reco:_0.72s_Exec:_3.90s_HTM:_20_Pre%26%2345%3BAUF:_%26%232b%3B1_Post%26%2345%3BAUF:_%26%232b%3B2%0A&setup=D2_R2_D2_U-_R2_U_R2_F2_R-_B2_F-_L_F-_R_F_U2_B_L-',
401+
'&alg=z2_%2F%2F_Orientation%0AB_L-_._._U_F2_._._._._%2F%2F_Cross_Reco:_0.00s_Exec:_1.89s_HTM:_4_%0AU2_B_U_B-_U-_._U_R-_U-_R_U2_L_U_L-_._%2F%2F_F2L_1_(BL)_Reco:_2.34s_Exec:_4.20s_HTM:_13_%0AU_._U_R-_U_R_U-_R-_U-_R_._%2F%2F_F2L_2_(BR)_Reco:_0.96s_Exec:_2.46s_HTM:_8_%0AR_U_R-_U-_._._U_U-_._F_U2_F-_U2_F_U-_F-_._._._._%2F%2F_F2L_3_(FL)_Reco:_0.66s_Exec:_3.66s_HTM:_13_%0AU2_._F-_U_F_U-_F-_U-_F_._._%2F%2F_F2L_4_(FR)_Reco:_2.16s_Exec:_2.28s_HTM:_8_%0AU-_._U-_._M_L-_U2_L_U_L-_U_L_U_M-_._%2F%2F_OLL_(10_Anti-Kite)_Reco:_1.20s_Exec:_3.39s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_R-_U-_F-_R_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_U_R_U2_%2F%2F_PLL_(F)_Reco:_0.72s_Exec:_3.90s_HTM:_20_Pre%26%2345%3BAUF:_%26%232b%3B1_Post%26%2345%3BAUF:_%26%232b%3B2%0A&setup=D2_R2_D2_U-_R2_U_R2_F2_R-_B2_F-_L_F-_R_F_U2_B_L-',
402402
self.solve.link_alg_cubing,
403403
)
404404

405405
def test_link_cube_db(self):
406406
self.assertIn(
407-
'&alg=z2_%2F%2F_Orientation%0AB_L-_._._U_F2_._._._._%2F%2F_Cross_Reco:_0.00s_Exec:_1.89s_HTM:_4_%0AU2_B_U_B-_U-_._U_R-_U-_R_U2_L_U_L-_._%2F%2F_F2L_1_(BL)_Reco:_2.34s_Exec:_4.20s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_._U_R-_U_R_U-_R-_U-_R_._%2F%2F_F2L_2_(BR)_Reco:_0.96s_Exec:_2.46s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B2%0AR_U_R-_U-_._._U_U-_._F_U2_F-_U2_F_U-_F-_._._._._%2F%2F_F2L_3_(FL)_Reco:_0.66s_Exec:_3.66s_HTM:_13_%0AU2_._F-_U_F_U-_F-_U-_F_._._%2F%2F_F2L_4_(FR)_Reco:_2.16s_Exec:_2.28s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU-_._U-_._M_L-_U2_L_U_L-_U_L_U_M-_._%2F%2F_OLL_(10_Anti-Kite)_Reco:_1.20s_Exec:_3.39s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_R-_U-_F-_R_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_U_R_U2_%2F%2F_PLL_(F)_Reco:_0.72s_Exec:_3.90s_HTM:_20_Pre%26%2345%3BAUF:_%26%232b%3B1_Post%26%2345%3BAUF:_%26%232b%3B2%0A&scramble=D2_R2_D2_U-_R2_U_R2_F2_R-_B2_F-_L_F-_R_F_U2_B_L-',
407+
'&alg=z2_%2F%2F_Orientation%0AB_L-_._._U_F2_._._._._%2F%2F_Cross_Reco:_0.00s_Exec:_1.89s_HTM:_4_%0AU2_B_U_B-_U-_._U_R-_U-_R_U2_L_U_L-_._%2F%2F_F2L_1_(BL)_Reco:_2.34s_Exec:_4.20s_HTM:_13_%0AU_._U_R-_U_R_U-_R-_U-_R_._%2F%2F_F2L_2_(BR)_Reco:_0.96s_Exec:_2.46s_HTM:_8_%0AR_U_R-_U-_._._U_U-_._F_U2_F-_U2_F_U-_F-_._._._._%2F%2F_F2L_3_(FL)_Reco:_0.66s_Exec:_3.66s_HTM:_13_%0AU2_._F-_U_F_U-_F-_U-_F_._._%2F%2F_F2L_4_(FR)_Reco:_2.16s_Exec:_2.28s_HTM:_8_%0AU-_._U-_._M_L-_U2_L_U_L-_U_L_U_M-_._%2F%2F_OLL_(10_Anti-Kite)_Reco:_1.20s_Exec:_3.39s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_R-_U-_F-_R_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_U_R_U2_%2F%2F_PLL_(F)_Reco:_0.72s_Exec:_3.90s_HTM:_20_Pre%26%2345%3BAUF:_%26%232b%3B1_Post%26%2345%3BAUF:_%26%232b%3B2%0A&scramble=D2_R2_D2_U-_R2_U_R2_F2_R-_B2_F-_L_F-_R_F_U2_B_L-',
408408
self.solve.link_cube_db,
409409
)
410410

‎term_timer/tests/test_solve_54.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,25 +241,25 @@ def test_reconstruction_step_line(self):
241241
"R2 [pause].[/pause] U [pause].[/pause] F L [pause].[/pause] "
242242
"U F2 U' B2 [reco-pause].[/reco-pause]",
243243

244-
"[pre-auf]U'[/pre-auf] "
244+
"U' "
245245
"[su]R U R' U[/su] "
246246
"[pair-ie]B U' B'[/pair-ie] "
247247
"[reco-pause].[/reco-pause]",
248248

249-
"[pre-auf]U[/pre-auf] "
249+
"U "
250250
"[pair-ie]F' U F[/pair-ie] "
251251
"U' "
252252
"[pair-ie]F U F'[/pair-ie] "
253253
"[reco-pause].[/reco-pause]",
254254

255-
"[pre-auf]U2[/pre-auf] [pause].[/pause] "
255+
"U2 [pause].[/pause] "
256256
"R [deletion]U'[/deletion] [deletion]R'[/deletion] "
257257
"[addition].[/addition] U [deletion].[/deletion] "
258258
"[deletion]U'[/deletion] [deletion]R[/deletion] "
259259
"[deletion]U2[/deletion] R' U [pair-ie]F' U' F[/pair-ie] "
260260
"[reco-pause].[/reco-pause]",
261261

262-
"[pre-auf]U[/pre-auf] "
262+
"U "
263263
"[sa]L U' L' U'[/sa] "
264264
"[pair-ie]B' U B[/pair-ie] "
265265
"[reco-pause].[/reco-pause]",
@@ -292,20 +292,20 @@ def test_reconstruction_step_line_multiple(self):
292292
"[pause].[/pause] U F2 U' B2 "
293293
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
294294

295-
"[pre-auf]U'[/pre-auf] "
295+
"U' "
296296
"[su]R U R' U[/su] "
297297
"[pair-ie]B U' B'[/pair-ie] "
298298
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause] "
299299
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause] "
300300
"[reco-pause].[/reco-pause]",
301301

302-
"[pre-auf]U[/pre-auf] "
302+
"U "
303303
"[pair-ie]F' U F[/pair-ie] "
304304
"U' "
305305
"[pair-ie]F U F'[/pair-ie] "
306306
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
307307

308-
"[pre-auf]U2[/pre-auf] [pause].[/pause] "
308+
"U2 [pause].[/pause] "
309309
"R [deletion]U'[/deletion] [deletion]R'[/deletion] "
310310
"[addition].[/addition] [addition].[/addition] "
311311
"[addition].[/addition] U [deletion].[/deletion] "
@@ -314,7 +314,7 @@ def test_reconstruction_step_line_multiple(self):
314314
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause] "
315315
"[reco-pause].[/reco-pause] [reco-pause].[/reco-pause]",
316316

317-
"[pre-auf]U[/pre-auf] "
317+
"U "
318318
"[sa]L U' L' U'[/sa] "
319319
"[pair-ie]B' U B[/pair-ie] "
320320
"[reco-pause].[/reco-pause]",
@@ -395,13 +395,13 @@ def test_reconstruction_step_text_multiple(self):
395395

396396
def test_link_alg_cubing(self):
397397
self.assertIn(
398-
'&alg=z2_%2F%2F_Orientation%0AR2_._U_._F_L_._._U_F2_U-_B2_._._%2F%2F_Cross_Reco:_0.00s_Exec:_3.75s_HTM:_8_%0AU-_R_U_R-_U_B_U-_B-_._._._._._%2F%2F_F2L_1_(BR)_Reco:_1.32s_Exec:_1.89s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU_F-_U_F_U-_F_U_F-_._._%2F%2F_F2L_2_(FL)_Reco:_2.43s_Exec:_1.89s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU2_._R_U-_R-_U_._U-_R_U2_R-_U_F-_U-_F_._._._._%2F%2F_F2L_3_(FR)_Reco:_1.05s_Exec:_3.60s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_L_U-_L-_U-_B-_U_B_._%2F%2F_F2L_4_(BL)_Reco:_1.98s_Exec:_1.17s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU-_._M_F_U_F-_._U-_F-_L_F_l-_._._._._%2F%2F_OLL_(32_Anti-Couch)_Reco:_0.45s_Exec:_2.49s_HTM:_11_Pre%26%2345%3BAUF:_%26%232b%3B1%0AR_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_._R_R-_F-_U2_%2F%2F_PLL_(T)_Reco:_2.22s_Exec:_3.12s_HTM:_17_Post%26%2345%3BAUF:_%26%232b%3B2%0A&setup=F2_D2_F2_D-_U-_L2_B2_L2_B2_U_L_U-_B_D_R2_U_L_F2_U_R2_U2',
398+
'&alg=z2_%2F%2F_Orientation%0AR2_._U_._F_L_._._U_F2_U-_B2_._._%2F%2F_Cross_Reco:_0.00s_Exec:_3.75s_HTM:_8_%0AU-_R_U_R-_U_B_U-_B-_._._._._._%2F%2F_F2L_1_(BR)_Reco:_1.32s_Exec:_1.89s_HTM:_8_%0AU_F-_U_F_U-_F_U_F-_._._%2F%2F_F2L_2_(FL)_Reco:_2.43s_Exec:_1.89s_HTM:_8_%0AU2_._R_U-_R-_U_._U-_R_U2_R-_U_F-_U-_F_._._._._%2F%2F_F2L_3_(FR)_Reco:_1.05s_Exec:_3.60s_HTM:_13_%0AU_L_U-_L-_U-_B-_U_B_._%2F%2F_F2L_4_(BL)_Reco:_1.98s_Exec:_1.17s_HTM:_8_%0AU-_._M_F_U_F-_._U-_F-_L_F_l-_._._._._%2F%2F_OLL_(32_Anti-Couch)_Reco:_0.45s_Exec:_2.49s_HTM:_11_Pre%26%2345%3BAUF:_%26%232b%3B1%0AR_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_._R_R-_F-_U2_%2F%2F_PLL_(T)_Reco:_2.22s_Exec:_3.12s_HTM:_17_Post%26%2345%3BAUF:_%26%232b%3B2%0A&setup=F2_D2_F2_D-_U-_L2_B2_L2_B2_U_L_U-_B_D_R2_U_L_F2_U_R2_U2',
399399
self.solve.link_alg_cubing,
400400
)
401401

402402
def test_link_cube_db(self):
403403
self.assertIn(
404-
'&alg=z2_%2F%2F_Orientation%0AR2_._U_._F_L_._._U_F2_U-_B2_._._%2F%2F_Cross_Reco:_0.00s_Exec:_3.75s_HTM:_8_%0AU-_R_U_R-_U_B_U-_B-_._._._._._%2F%2F_F2L_1_(BR)_Reco:_1.32s_Exec:_1.89s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU_F-_U_F_U-_F_U_F-_._._%2F%2F_F2L_2_(FL)_Reco:_2.43s_Exec:_1.89s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU2_._R_U-_R-_U_._U-_R_U2_R-_U_F-_U-_F_._._._._%2F%2F_F2L_3_(FR)_Reco:_1.05s_Exec:_3.60s_HTM:_13_Pre%26%2345%3BAUF:_%26%232b%3B2%0AU_L_U-_L-_U-_B-_U_B_._%2F%2F_F2L_4_(BL)_Reco:_1.98s_Exec:_1.17s_HTM:_8_Pre%26%2345%3BAUF:_%26%232b%3B1%0AU-_._M_F_U_F-_._U-_F-_L_F_l-_._._._._%2F%2F_OLL_(32_Anti-Couch)_Reco:_0.45s_Exec:_2.49s_HTM:_11_Pre%26%2345%3BAUF:_%26%232b%3B1%0AR_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_._R_R-_F-_U2_%2F%2F_PLL_(T)_Reco:_2.22s_Exec:_3.12s_HTM:_17_Post%26%2345%3BAUF:_%26%232b%3B2%0A&scramble=F2_D2_F2_D-_U-_L2_B2_L2_B2_U_L_U-_B_D_R2_U_L_F2_U_R2_U2',
404+
'&alg=z2_%2F%2F_Orientation%0AR2_._U_._F_L_._._U_F2_U-_B2_._._%2F%2F_Cross_Reco:_0.00s_Exec:_3.75s_HTM:_8_%0AU-_R_U_R-_U_B_U-_B-_._._._._._%2F%2F_F2L_1_(BR)_Reco:_1.32s_Exec:_1.89s_HTM:_8_%0AU_F-_U_F_U-_F_U_F-_._._%2F%2F_F2L_2_(FL)_Reco:_2.43s_Exec:_1.89s_HTM:_8_%0AU2_._R_U-_R-_U_._U-_R_U2_R-_U_F-_U-_F_._._._._%2F%2F_F2L_3_(FR)_Reco:_1.05s_Exec:_3.60s_HTM:_13_%0AU_L_U-_L-_U-_B-_U_B_._%2F%2F_F2L_4_(BL)_Reco:_1.98s_Exec:_1.17s_HTM:_8_%0AU-_._M_F_U_F-_._U-_F-_L_F_l-_._._._._%2F%2F_OLL_(32_Anti-Couch)_Reco:_0.45s_Exec:_2.49s_HTM:_11_Pre%26%2345%3BAUF:_%26%232b%3B1%0AR_U_R-_U-_R-_F_R2_U-_R-_U-_R_U_R-_._R_R-_F-_U2_%2F%2F_PLL_(T)_Reco:_2.22s_Exec:_3.12s_HTM:_17_Post%26%2345%3BAUF:_%26%232b%3B2%0A&scramble=F2_D2_F2_D-_U-_L2_B2_L2_B2_U_L_U-_B_D_R2_U_L_F2_U_R2_U2',
405405
self.solve.link_cube_db,
406406
)
407407

0 commit comments

Comments
 (0)