mapFolding 0.14.0__tar.gz → 0.14.1__tar.gz

{mapfolding-0.14.0 → mapfolding-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapFolding
-Version: 0.14.0
+Version: 0.14.1
 Summary: Map folding, meanders, stamp folding, semi-meanders. Experiment with algorithm transformations and code optimization.
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0
@@ -34,15 +34,14 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astToolkit>=0.7.1
-Requires-Dist: cytoolz
+Requires-Dist: astToolkit
 Requires-Dist: hunterMakesPy
-Requires-Dist: numba
 Requires-Dist: numpy
 Requires-Dist: platformdirs
 Provides-Extra: development
 Requires-Dist: mypy; extra == "development"
 Requires-Dist: pyupgrade; extra == "development"
+Requires-Dist: py-spy; extra == "development"
 Requires-Dist: setuptools-scm; extra == "development"
 Provides-Extra: numba
 Requires-Dist: numba; extra == "numba"

{mapfolding-0.14.0 → mapfolding-0.14.1}/mapFolding/_oeisFormulas/Z0Z_aOFn.py

@@ -1,5 +1,4 @@
 from mapFolding._oeisFormulas.A000136 import A000136
-from mapFolding._oeisFormulas.matrixMeanders import curveMaximum
 from mapFolding.oeis import dictionaryOEIS
 import sys
 import time

mapfolding-0.14.1/mapFolding/_oeisFormulas/matrixMeanders.py

@@ -0,0 +1,79 @@
+from mapFolding._oeisFormulas.matrixMeandersAnnex import curveMaximum as curveMaximum
+from typing import NamedTuple
+
+class BifurcatedCurves(NamedTuple):
+    bifurcationEven: int
+    bifurcationOdd: int
+    distinctCrossings: int
+    curveLocationsMAXIMUM: int
+
+dictionaryCurveLocations: dict[int, list[int]] = {}
+
+def getCurveLocations(bridges: int) -> list[BifurcatedCurves]:
+	global dictionaryCurveLocations  # noqa: PLW0603
+	curveLocationsMAXIMUM, bifurcationEvenLocator, bifurcationOddLocator = curveMaximum[bridges]
+	listBifurcatedCurves: list[BifurcatedCurves] = []
+	# TODO This is ready for concurrency and/or vectorization.
+	for curveLocations, listDistinctCrossings in dictionaryCurveLocations.items():
+		bifurcationEven = (curveLocations & bifurcationEvenLocator) >> 1
+		bifurcationOdd = (curveLocations & bifurcationOddLocator)
+		distinctCrossings = sum(listDistinctCrossings)
+		listBifurcatedCurves.append(BifurcatedCurves(bifurcationEven, bifurcationOdd, distinctCrossings, curveLocationsMAXIMUM))
+	dictionaryCurveLocations = {}
+	return listBifurcatedCurves
+
+def recordAnalysis(curveLocationAnalysis: int, curveLocationsMAXIMUM: int, distinctCrossings: int) -> None:
+	if curveLocationAnalysis < curveLocationsMAXIMUM:
+		dictionaryCurveLocations.setdefault(curveLocationAnalysis, []).append(distinctCrossings)
+
+def analyzeCurve(bifurcationEven: int, bifurcationOdd: int, distinctCrossings: int, curveLocationsMAXIMUM: int) -> None:
+	bifurcationEvenFinalZero = (bifurcationEven & 0b1) == 0
+	bifurcationEvenHasCurves = bifurcationEven != 1
+	bifurcationOddFinalZero = (bifurcationOdd & 0b1) == 0
+	bifurcationOddHasCurves = bifurcationOdd != 1
+
+	if bifurcationEvenHasCurves:
+		curveLocationAnalysis = (bifurcationEven >> 1) | (bifurcationOdd << 2) | bifurcationEvenFinalZero
+		recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
+
+	if bifurcationOddHasCurves:
+		curveLocationAnalysis = (bifurcationOdd >> 2) | (bifurcationEven << 3) | (bifurcationOddFinalZero << 1)
+		recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
+
+	curveLocationAnalysis = ((bifurcationOdd | (bifurcationEven << 1)) << 2) | 3
+	recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
+
+	if bifurcationEvenHasCurves and bifurcationOddHasCurves and (bifurcationEvenFinalZero or bifurcationOddFinalZero):
+		XOrHere2makePair = 0b1
+		findUnpairedBinary1 = 0
+
+		if bifurcationEvenFinalZero and not bifurcationOddFinalZero:
+			while findUnpairedBinary1 >= 0:
+				XOrHere2makePair <<= 2
+				findUnpairedBinary1 += 1 if (bifurcationEven & XOrHere2makePair) == 0 else -1
+			bifurcationEven ^= XOrHere2makePair
+
+		elif bifurcationOddFinalZero and not bifurcationEvenFinalZero:
+			while findUnpairedBinary1 >= 0:
+				XOrHere2makePair <<= 2
+				findUnpairedBinary1 += 1 if (bifurcationOdd & XOrHere2makePair) == 0 else -1
+			bifurcationOdd ^= XOrHere2makePair
+
+		curveLocationAnalysis = ((bifurcationEven >> 2) << 1) | (bifurcationOdd >> 2)
+		recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
+
+def initializeCurveLocations(startingCurveLocations: dict[int, int]) -> None:
+	global dictionaryCurveLocations  # noqa: PLW0603
+	dictionaryCurveLocations = {curve: [distinctCrossings] for curve, distinctCrossings in startingCurveLocations.items()}
+
+def count(bridges: int, startingCurveLocations: dict[int, int]) -> int:
+	initializeCurveLocations(startingCurveLocations)
+
+	while bridges > 0:
+		bridges -= 1
+
+		# TODO This could be parallelized when `recordAnalysis` is thread-safe
+		for bifurcatedCurve in getCurveLocations(bridges):
+			analyzeCurve(*bifurcatedCurve)
+
+	return getCurveLocations(bridges)[0].distinctCrossings

{mapfolding-0.14.0 → mapfolding-0.14.1}/mapFolding/_oeisFormulas/matrixMeandersAnnex.py

@@ -35,7 +35,7 @@ curveMaximum: dict[int, limitLocators] = {
 25: limitLocators(18014398509481984, 0xaaaaaaaaaaaaaa, 0x55555555555555),
 26: limitLocators(72057594037927936, 0x2aaaaaaaaaaaaaa, 0x155555555555555),
 27: limitLocators(288230376151711744, 0xaaaaaaaaaaaaaaa, 0x555555555555555),
-28: limitLocators(1152921504606846976, 0x2aaaaaaaaaaaaaaa, 0x1555555555555555),
+28: limitLocators(1152921504606846976, 0x2aaaaaaaaaaaaaaa, 0x1555555555555555), # 0x2aaaaaaaaaaaaaaa.bit_length() = 62
 29: limitLocators(4611686018427387904, 0xaaaaaaaaaaaaaaaa, 0x5555555555555555),
 30: limitLocators(18446744073709551616, 0x2aaaaaaaaaaaaaaaa, 0x15555555555555555),
 31: limitLocators(73786976294838206464, 0xaaaaaaaaaaaaaaaaa, 0x55555555555555555),

{mapfolding-0.14.0 → mapfolding-0.14.1}/mapFolding.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapFolding
-Version: 0.14.0
+Version: 0.14.1
 Summary: Map folding, meanders, stamp folding, semi-meanders. Experiment with algorithm transformations and code optimization.
 Author-email: Hunter Hogan <HunterHogan@pm.me>
 License: CC-BY-NC-4.0
@@ -34,15 +34,14 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astToolkit>=0.7.1
-Requires-Dist: cytoolz
+Requires-Dist: astToolkit
 Requires-Dist: hunterMakesPy
-Requires-Dist: numba
 Requires-Dist: numpy
 Requires-Dist: platformdirs
 Provides-Extra: development
 Requires-Dist: mypy; extra == "development"
 Requires-Dist: pyupgrade; extra == "development"
+Requires-Dist: py-spy; extra == "development"
 Requires-Dist: setuptools-scm; extra == "development"
 Provides-Extra: numba
 Requires-Dist: numba; extra == "numba"

{mapfolding-0.14.0 → mapfolding-0.14.1}/mapFolding.egg-info/requires.txt

@@ -1,13 +1,12 @@
-astToolkit>=0.7.1
-cytoolz
+astToolkit
 hunterMakesPy
-numba
 numpy
 platformdirs
 
 [development]
 mypy
 pyupgrade
+py-spy
 setuptools-scm
 
 [numba]

{mapfolding-0.14.0 → mapfolding-0.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mapFolding"
-version = "0.14.0"
+version = "0.14.1"
 description = "Map folding, meanders, stamp folding, semi-meanders. Experiment with algorithm transformations and code optimization."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -128,16 +128,15 @@ classifiers = [
 urls = { Donate = "https://www.patreon.com/integrated", Homepage = "https://github.com/hunterhogan/mapFolding", Issues = "https://github.com/hunterhogan/mapFolding/issues", Repository = "https://github.com/hunterhogan/mapFolding.git" }
 scripts = { OEIS_for_n = "mapFolding.oeis:OEIS_for_n", clearOEIScache = "mapFolding.oeis:clearOEIScache", getOEISids = "mapFolding.oeis:getOEISids" }
 dependencies = [
-  "astToolkit>=0.7.1",
-  "cytoolz",
+  "astToolkit",
   "hunterMakesPy",
-  "numba",
   "numpy",
   "platformdirs",
 ]
 optional-dependencies = { development = [
   "mypy",
   "pyupgrade",
+  "py-spy",
   "setuptools-scm",
 ], numba = [
   "numba",

mapfolding-0.14.0/mapFolding/_oeisFormulas/matrixMeanders.py

@@ -1,65 +0,0 @@
-from mapFolding._oeisFormulas.matrixMeandersAnnex import curveMaximum as curveMaximum
-
-dictionaryCurveLocations: dict[int, int] = {}
-
-def getCurveLocations() -> dict[int, int]:
-	global dictionaryCurveLocations  # noqa: PLW0603
-	sherpa = dictionaryCurveLocations.copy()
-	dictionaryCurveLocations = {}
-	return sherpa
-
-def recordAnalysis(curveLocationAnalysis: int, curveLocationsMAXIMUM: int, distinctCrossings: int) -> None:
-	if curveLocationAnalysis < curveLocationsMAXIMUM:
-		dictionaryCurveLocations[curveLocationAnalysis] = dictionaryCurveLocations.get(curveLocationAnalysis, 0) + distinctCrossings
-
-def initializeCurveLocations(startingCurveLocations: dict[int, int]) -> None:
-	global dictionaryCurveLocations  # noqa: PLW0603
-	dictionaryCurveLocations = startingCurveLocations.copy()
-
-def count(bridges: int, startingCurveLocations: dict[int, int]) -> int:
-	initializeCurveLocations(startingCurveLocations)
-
-	while bridges > 0:
-		bridges -= 1
-		curveLocationsMAXIMUM, bifurcationEvenLocator, bifurcationOddLocator = curveMaximum[bridges]
-
-		for curveLocations, distinctCrossings in getCurveLocations().items():
-			bifurcationEven = (curveLocations & bifurcationEvenLocator) >> 1
-			bifurcationOdd = curveLocations & bifurcationOddLocator
-
-			bifurcationEvenFinalZero = (bifurcationEven & 0b1) == 0
-			bifurcationEvenHasCurves = bifurcationEven != 1
-			bifurcationOddFinalZero = (bifurcationOdd & 0b1) == 0
-			bifurcationOddHasCurves = bifurcationOdd != 1
-
-			if bifurcationEvenHasCurves:
-				curveLocationAnalysis = (bifurcationEven >> 1) | (bifurcationOdd << 2) | bifurcationEvenFinalZero
-				recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
-
-			if bifurcationOddHasCurves:
-				curveLocationAnalysis = (bifurcationOdd >> 2) | (bifurcationEven << 3) | (bifurcationOddFinalZero << 1)
-				recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
-
-			curveLocationAnalysis = ((bifurcationOdd | (bifurcationEven << 1)) << 2) | 3
-			recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
-
-			if bifurcationEvenHasCurves and bifurcationOddHasCurves and (bifurcationEvenFinalZero or bifurcationOddFinalZero):
-				XOrHere2makePair = 0b1
-				findUnpairedBinary1 = 0
-
-				if bifurcationEvenFinalZero and not bifurcationOddFinalZero:
-					while findUnpairedBinary1 >= 0:
-						XOrHere2makePair <<= 2
-						findUnpairedBinary1 += 1 if (bifurcationEven & XOrHere2makePair) == 0 else -1
-					bifurcationEven ^= XOrHere2makePair
-
-				elif bifurcationOddFinalZero and not bifurcationEvenFinalZero:
-					while findUnpairedBinary1 >= 0:
-						XOrHere2makePair <<= 2
-						findUnpairedBinary1 += 1 if (bifurcationOdd & XOrHere2makePair) == 0 else -1
-					bifurcationOdd ^= XOrHere2makePair
-
-				curveLocationAnalysis = ((bifurcationEven >> 2) << 1) | (bifurcationOdd >> 2)
-				recordAnalysis(curveLocationAnalysis, curveLocationsMAXIMUM, distinctCrossings)
-
-	return sum(getCurveLocations().values())