|
8 | 8 | dimensionThirdNearest首, howManyDimensionsHaveOddParity, Leaf, leafOrigin, mapShapeIs2上nDimensions, Pile, pileOrigin, |
9 | 9 | reverseLookup, 一, 三, 二, 四, 零, 首一, 首一二, 首三, 首二, 首零, 首零一, 首零一二, 首零二) |
10 | 10 | from mapFolding._e.dataBaskets import EliminationState |
11 | | -from mapFolding._e.filters import between, consecutive, exclude, leafIsPinned |
| 11 | +from mapFolding._e.filters import between吗, consecutive吗, exclude, leafIsPinned |
12 | 12 | from more_itertools import all_unique, loops |
13 | 13 | from operator import add, sub |
14 | 14 |
|
@@ -183,8 +183,8 @@ def getDomainDimension二(state: EliminationState) -> tuple[tuple[int, int, int, |
183 | 183 | return _getDomainDimension二(domain二零and二, domain二一零and二一, state.dimensionsTotal) |
184 | 184 | @cache |
185 | 185 | def _getDomainDimension二(domain二零and二: tuple[tuple[int, int], ...], domain二一零and二一: tuple[tuple[int, int], ...], dimensionsTotal: int) -> tuple[tuple[int, int, int, int], ...]: |
186 | | - domain0corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive, domain二零and二)) |
187 | | - domain一corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive, domain二一零and二一)) |
| 186 | + domain0corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive吗, domain二零and二)) |
| 187 | + domain一corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive吗, domain二一零and二一)) |
188 | 188 | pilesTotal: int = len(domain一corners) |
189 | 189 |
|
190 | 190 | domainCombined: list[tuple[int, int, int, int]] = [] |
@@ -289,8 +289,8 @@ def getDomainDimension首二(state: EliminationState) -> tuple[tuple[int, int, i |
289 | 289 | return _getDomainDimension首二(state.dimensionsTotal, domain首零二and首二, domain首零一二and首一二) |
290 | 290 | @cache |
291 | 291 | def _getDomainDimension首二(dimensionsTotal: int, domain首零二and首二: tuple[tuple[int, int], ...], domain首零一二and首一二: tuple[tuple[int, int], ...]) -> tuple[tuple[int, int, int, int], ...]: |
292 | | - domain0corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive, domain首零二and首二)) |
293 | | - domain一corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive, domain首零一二and首一二)) |
| 292 | + domain0corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive吗, domain首零二and首二)) |
| 293 | + domain一corners: tuple[tuple[int, int], ...] = tuple(filter(consecutive吗, domain首零一二and首一二)) |
294 | 294 | pilesTotal: Leaf = len(domain一corners) |
295 | 295 |
|
296 | 296 | domainCombined: list[tuple[int, int, int, int]] = [] |
@@ -394,7 +394,7 @@ def _getDomains二Or二一(domain零: tuple[int, ...], domain0: tuple[int, ...], |
394 | 394 | pilesTotal: int = len(domain零) |
395 | 395 | pilesFewerDomain0: int = pilesTotal - len(domain0) |
396 | 396 |
|
397 | | - for indexDomain零, pileOfLeaf零 in enumerate(filter(between(pileOrigin, 首零(dimensionsTotal)-零), domain零)): |
| 397 | + for indexDomain零, pileOfLeaf零 in enumerate(filter(between吗(pileOrigin, 首零(dimensionsTotal)-零), domain零)): |
398 | 398 | indicesDomain0ToExclude: list[int] = [] |
399 | 399 |
|
400 | 400 | dimensionTail: int = dimensionNearestTail(pileOfLeaf零 - is_odd(pileOfLeaf零)) |
|
0 commit comments