Skip to content

Commit 071b34e

Browse files
committed
In the root __init__.py, stop "re-exporting" functions from "public" modules. That change _might_ have mitigated the slowness problem.
1 parent 32b8ba4 commit 071b34e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+379
-537
lines changed

.vscode/code-spell-dictionary-workspace.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ Mersenne
210210
meshgrid
211211
Meshgrids
212212
metaprogramming
213+
mobius
213214
Mult
214215
mypy
215216
Natalya
@@ -238,6 +239,8 @@ nuitka
238239
numba
239240
numbinations
240241
NUMERICALPYTHON
242+
numma
243+
Numma
241244
NZER
242245
objmode
243246
objs
@@ -348,6 +351,7 @@ Tenabled
348351
testutil
349352
Tfinalbody
350353
thất
354+
thon
351355
threadfence
352356
tion
353357
Tkwd

easyRun/NOTcountingFolds.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# ruff: noqa
22
from collections import ChainMap
3-
from mapFolding import ansiColorReset, ansiColors, dictionaryOEIS, dictionaryOEISMapFolding
4-
from mapFolding.basecamp import NOTcountingFolds
3+
from mapFolding import ansiColorReset, ansiColors
4+
from mapFolding.oeis import dictionaryOEIS, dictionaryOEISMapFolding, NOTcountingFolds
55
import sys
66
import time
77

8-
dictionaryONE = ChainMap(dictionaryOEISMapFolding, dictionaryOEIS) # pyright: ignore[reportArgumentType]
8+
dictionaryONE = ChainMap(dictionaryOEISMapFolding, dictionaryOEIS) # pyright: ignore[reportArgumentType] # ty:ignore[invalid-argument-type]
99

1010
if __name__ == '__main__':
1111
def _write() -> None:
@@ -40,7 +40,7 @@ def _write() -> None:
4040
for n in dict.fromkeys(nList):
4141

4242
timeStart = time.perf_counter()
43-
countTotal = NOTcountingFolds(oeisID, n, flow, CPUlimit)
43+
countTotal = NOTcountingFolds(oeisID, n, flow, None, CPUlimit)
4444

4545
_write()
4646

easyRun/countFolds.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
# ruff: noqa
88
# pyright: basic
99
from collections.abc import Sequence
10-
from mapFolding import ansiColorReset, ansiColors, dictionaryOEISMapFolding
10+
from mapFolding import ansiColorReset, ansiColors
1111
from mapFolding.basecamp import countFolds
12+
from mapFolding.oeis import dictionaryOEISMapFolding
1213
from os import PathLike
1314
from pathlib import PurePath
1415
import sys

easyRun/meanders.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ruff: noqa
22
# pyright: basic
3-
from mapFolding import ansiColorReset, ansiColors, dictionaryOEIS
4-
from mapFolding.basecamp import NOTcountingFolds
3+
from mapFolding import ansiColorReset, ansiColors
4+
from mapFolding.oeis import dictionaryOEIS, NOTcountingFolds
55
import gc
66
import sys
77
import time

mapFolding/__init__.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,3 @@
1818

1919
# isort: split
2020
from mapFolding._theSSOT import packageSettings as packageSettings
21-
22-
# isort: split
23-
from mapFolding.beDRY import (
24-
defineProcessorLimit as defineProcessorLimit, getConnectionGraph as getConnectionGraph,
25-
getLeavesTotal as getLeavesTotal, getTaskDivisions as getTaskDivisions, makeDataContainer as makeDataContainer,
26-
validateListDimensions as validateListDimensions)
27-
28-
# isort: split
29-
from mapFolding.filesystemToolkit import (
30-
getFilenameFoldsTotal as getFilenameFoldsTotal, getPathFilenameFoldsTotal as getPathFilenameFoldsTotal,
31-
getPathRootJobDEFAULT as getPathRootJobDEFAULT, saveFoldsTotal as saveFoldsTotal,
32-
saveFoldsTotalFAILearly as saveFoldsTotalFAILearly)
33-
34-
# isort: split
35-
from mapFolding.oeis import (
36-
dictionaryOEIS as dictionaryOEIS, dictionaryOEISMapFolding as dictionaryOEISMapFolding,
37-
getFoldsTotalKnown as getFoldsTotalKnown, getOEISids as getOEISids, OEIS_for_n as OEIS_for_n,
38-
oeisIDfor_n as oeisIDfor_n)

mapFolding/_e/Z0Z_analysisPython/theExcluderBeast.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
首零一三, 首零一二, 首零一二三, 首零三, 首零二, 首零二三)
1414
from mapFolding._e.dataBaskets import EliminationState
1515
from mapFolding._e.dataDynamic import getDataFrameFoldings
16-
from mapFolding._e.filters import between, exclude
16+
from mapFolding._e.filters import between吗, exclude
1717
from mapFolding._e.pin2上nDimensions import pinPilesAtEnds
1818
from mapFolding._e.pinIt import deconstructPermutationSpaceAtPile, deconstructPermutationSpaceByDomainOfLeaf
1919
from mapFolding._e.Z0Z_analysisPython.toolkit import detectPermutationSpaceErrors, PermutationSpaceStatus
@@ -99,7 +99,7 @@ def writeExclusionDataCollated(listDimensions: Sequence[int] = (5, 6)) -> list[P
9999
listIndicesExcluded: list[IndexPilesTotal] = sorted(map(indexOf, repeat(listOfPiles), listPilesExcluded))
100100

101101
pilesTotal = len(listOfPiles)
102-
denominators: list[int] = list(filter(between(0, pilesTotal), denominatorsValid))
102+
denominators: list[int] = list(filter(between吗(0, pilesTotal), denominatorsValid))
103103
dictionaryIndices[mapKind].setdefault(leafExcluder.__name__, {}).setdefault(pileExcluder.__name__, {})[leafExcluded.__name__] = [
104104
expressIndexAsFractionAddend(index, pilesTotal, tuple(denominators)) for index in listIndicesExcluded]
105105
dictionaryIndicesNegative[mapKind].setdefault(leafExcluder.__name__, {}).setdefault(pileExcluder.__name__, {})[leafExcluded.__name__] = [

mapFolding/_e/__init__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
# isort: split
1010
from mapFolding._e._semiotics import (
11-
dimensionIndex as dimensionIndex, leafOrigin as leafOrigin, pileOrigin as pileOrigin,
12-
sentinelBitAdjustment as sentinelBitAdjustment, as , as , as , as , as , as , as , as , as ,
13-
as , 首一 as 首一, 首一三 as 首一三, 首一二 as 首一二, 首一二三 as 首一二三, 首三 as 首三, 首二 as 首二, 首二三 as 首二三, 首零 as 首零, 首零一 as 首零一,
14-
首零一三 as 首零一三, 首零一二 as 首零一二, 首零一二三 as 首零一二三, 首零三 as 首零三, 首零二 as 首零二, 首零二三 as 首零二三)
11+
dimensionIndex as dimensionIndex, leafOrigin as leafOrigin, pileOrigin as pileOrigin, as , as , as , as ,
12+
as , as , as , as , as , as , 首一 as 首一, 首一三 as 首一三, 首一二 as 首一二, 首一二三 as 首一二三, 首三 as 首三, 首二 as 首二,
13+
首二三 as 首二三, 首零 as 首零, 首零一 as 首零一, 首零一三 as 首零一三, 首零一二 as 首零一二, 首零一二三 as 首零一二三, 首零三 as 首零三, 首零二 as 首零二, 首零二三 as 首零二三)
1514

1615
# isort: split
1716
from mapFolding._e._beDRY import (

mapFolding/_e/_beDRY.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def DOTgetPileIfPileRangeOfLeaves(permutationSpace: PermutationSpace, pile: Pile
211211
return ImaPileRangeOfLeaves
212212
return default
213213

214-
# TODO semiotics `getAntiPileRangeOfLeaves`, Improve.
214+
# SEMIOTICS `getAntiPileRangeOfLeaves`, Improve.
215215
def getAntiPileRangeOfLeaves(leavesTotal: int, leaves: Iterable[Leaf]) -> PileRangeOfLeaves:
216216
"""You can build a complement `PileRangeOfLeaves` by clearing each `Leaf` bit in `leaves`.
217217

mapFolding/_e/_leafDomains.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
dimensionThirdNearest首, howManyDimensionsHaveOddParity, Leaf, leafOrigin, mapShapeIs2上nDimensions, Pile, pileOrigin,
99
reverseLookup, , , , , , 首一, 首一二, 首三, 首二, 首零, 首零一, 首零一二, 首零二)
1010
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
1212
from more_itertools import all_unique, loops
1313
from operator import add, sub
1414

@@ -183,8 +183,8 @@ def getDomainDimension二(state: EliminationState) -> tuple[tuple[int, int, int,
183183
return _getDomainDimension二(domain二零and二, domain二一零and二一, state.dimensionsTotal)
184184
@cache
185185
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二一))
188188
pilesTotal: int = len(domain一corners)
189189

190190
domainCombined: list[tuple[int, int, int, int]] = []
@@ -289,8 +289,8 @@ def getDomainDimension首二(state: EliminationState) -> tuple[tuple[int, int, i
289289
return _getDomainDimension首二(state.dimensionsTotal, domain首零二and首二, domain首零一二and首一二)
290290
@cache
291291
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首一二))
294294
pilesTotal: Leaf = len(domain一corners)
295295

296296
domainCombined: list[tuple[int, int, int, int]] = []
@@ -394,7 +394,7 @@ def _getDomains二Or二一(domain零: tuple[int, ...], domain0: tuple[int, ...],
394394
pilesTotal: int = len(domain零)
395395
pilesFewerDomain0: int = pilesTotal - len(domain0)
396396

397-
for indexDomain零, pileOfLeaf零 in enumerate(filter(between(pileOrigin, 首零(dimensionsTotal)-), domain零)):
397+
for indexDomain零, pileOfLeaf零 in enumerate(filter(between吗(pileOrigin, 首零(dimensionsTotal)-), domain零)):
398398
indicesDomain0ToExclude: list[int] = []
399399

400400
dimensionTail: int = dimensionNearestTail(pileOfLeaf零 - is_odd(pileOfLeaf零))

mapFolding/_e/_pileRanges.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
mapShapeIs2上nDimensions, Pile, , 首一, 首二, 首零, 首零一)
1111
from mapFolding._e.dataBaskets import EliminationState
1212
from more_itertools import flatten
13-
from operator import add, iadd, isub, mul
13+
from operator import add, iadd, mul
1414
from pprint import pprint
1515
from typing import TYPE_CHECKING
1616

0 commit comments

Comments
 (0)