mapFolding 0.14.0__py3-none-any.whl → 0.14.1__py3-none-any.whl

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/_oeisFormulas/matrixMeanders.py

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

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.dist-info → mapfolding-0.14.1.dist-info}/METADATA

@@ -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.dist-info → mapfolding-0.14.1.dist-info}/RECORD

@@ -16,11 +16,11 @@ mapFolding/_oeisFormulas/A005316.py,sha256=3B4_2TT_ip3CcYngEaFS-rTNDx-x2TZ0r_J0f
 mapFolding/_oeisFormulas/A223094.py,sha256=z7t6RcRQlhXdbYImIER15KwG1_W7iV4MNIRDx9Q_Efs,284
 mapFolding/_oeisFormulas/A259702.py,sha256=9hUs8jzwOnJGmBsueS1yGsLjau4YVa0Yd9lYMG8UFso,123
 mapFolding/_oeisFormulas/A301620.py,sha256=pY0OJsCLhIEDHQUKpeSMTZ2SUFvcqt83uCOPE_lZCsw,225
-mapFolding/_oeisFormulas/Z0Z_aOFn.py,sha256=PjSUpcpNh_YXvc4lrC3xzpx6rz0yWbOuYEHugsssmns,572
+mapFolding/_oeisFormulas/Z0Z_aOFn.py,sha256=qTtjahVu733d-9Z86y1-A9VQC3-ge7j75ikNCIqX3HU,507
 mapFolding/_oeisFormulas/Z0Z_oeisMeanders.py,sha256=IDwGgieBJffmC3bAFaCqgIxPC9ZyRmqSxsWJ3VKyY2U,1746
 mapFolding/_oeisFormulas/__init__.py,sha256=n83beVb7HHplXYAM5HveaIAuR7KrJG99OaNHJGMb_uc,44
-mapFolding/_oeisFormulas/matrixMeanders.py,sha256=0QEzcOTvaOb0-6MiKUe1Uxoi-ESVIG5rlZxUA1e_l_s,2965
-mapFolding/_oeisFormulas/matrixMeandersAnnex.py,sha256=sl0UWwivpnbzIfi6E5cD0vSpHlSUu-Htw4yb4aN-Eg4,5809
+mapFolding/_oeisFormulas/matrixMeanders.py,sha256=me0YV5LDH-s5n9QaUTBT2OdVsc4m_EWxpKN_tvpidvI,3694
+mapFolding/_oeisFormulas/matrixMeandersAnnex.py,sha256=4_269UTFwWuxDwHPBYC7rpEUdrivA-imNN3j1C2udY0,5848
 mapFolding/reference/A005316JavaPort.py,sha256=6qqTzbD3PTwYGtqaywEURGXtNFx1lp8ofEwpQeEvAHc,4899
 mapFolding/reference/A005316imperative.py,sha256=hhjUxELOktNBmHrwIoxVA-mcFsOWgg01p780OBeqL04,3816
 mapFolding/reference/A005316intOptimized.py,sha256=oO9ktdYeFwtosVp5KliwH8JmCSxfjapjBM1iMECuDAc,4121
@@ -68,9 +68,9 @@ mapFolding/tests/test_filesystem.py,sha256=0rYQ62f4e3HOoymXrxDWbqNEBJQ7DGN8RUOMI
 mapFolding/tests/test_oeis.py,sha256=ejqaOMB61c1oUEBblPPBG9hFFXffpKuIS0CJMe7Rd1o,5497
 mapFolding/tests/test_other.py,sha256=ScBiJ78LnyAaW-RhxcouX6Xw10wgpSdqfvT4LO3WjnQ,4766
 mapFolding/tests/test_tasks.py,sha256=_pr9JRWjjNKA7sww70XvkJJdGPruBVzubM63RmD_Du0,4013
-mapfolding-0.14.0.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
-mapfolding-0.14.0.dist-info/METADATA,sha256=Y9pEjwsX2B8QeCarplVsfNroHV1PbngK9qej7DcuH40,5122
-mapfolding-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mapfolding-0.14.0.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
-mapfolding-0.14.0.dist-info/top_level.txt,sha256=aG3bjFBoxxuaV3Iu1wZAd241Ubs3cdaJtKYBQBDIjsg,11
-mapfolding-0.14.0.dist-info/RECORD,,
+mapfolding-0.14.1.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
+mapfolding-0.14.1.dist-info/METADATA,sha256=yu3RbpzV6ly9l-BejCo8RhHhjNO2xQaXldeali2Vxak,5117
+mapfolding-0.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mapfolding-0.14.1.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
+mapfolding-0.14.1.dist-info/top_level.txt,sha256=aG3bjFBoxxuaV3Iu1wZAd241Ubs3cdaJtKYBQBDIjsg,11
+mapfolding-0.14.1.dist-info/RECORD,,