mapFolding 0.15.3__py3-none-any.whl → 0.15.4__py3-none-any.whl

mapFolding/tests/test_computations.py

@@ -25,24 +25,26 @@ The `test_writeJobNumba` function shows how to test dynamically generated code,
 which is useful if you're working with the code synthesis features of the package.
 """
 
-from mapFolding import countFolds, getFoldsTotalKnown, oeisIDfor_n
-from mapFolding._oeisFormulas.Z0Z_oeisMeanders import dictionaryOEISMeanders
+from mapFolding import countFolds, dictionaryOEISMapFolding, dictionaryOEISMeanders, getFoldsTotalKnown, oeisIDfor_n
+from mapFolding.algorithms import oeisIDbyFormula
 from mapFolding.dataBaskets import MapFoldingState
-from mapFolding.oeis import dictionaryOEIS
 from mapFolding.someAssemblyRequired.makeAllModules import parametersNumbaLight
 from mapFolding.someAssemblyRequired.RecipeJob import RecipeJobTheorem2
 from mapFolding.syntheticModules.initializeState import transitionOnGroupsOfFolds
 from mapFolding.tests.conftest import registrarRecordsTemporaryFilesystemObject, standardizedEqualToCallableReturn
 from pathlib import Path, PurePosixPath
-from typing import Literal
+from typing import Literal, TYPE_CHECKING
 import importlib.util
 import multiprocessing
 import pytest
 
+if TYPE_CHECKING:
+	from collections.abc import Callable
+
 if __name__ == '__main__':
 	multiprocessing.set_start_method('spawn')
 
-def test_aOFn_calculate_value(oeisID: str) -> None:
+def test_aOFn_calculate_value_mapFolding(oeisID: str) -> None:
 	"""Verify OEIS sequence value calculations against known reference values.
 
 	Tests the `oeisIDfor_n` function by comparing its calculated output against
@@ -59,8 +61,28 @@ def test_aOFn_calculate_value(oeisID: str) -> None:
 		The OEIS sequence identifier to test calculations for.
 
 	"""
-	for n in dictionaryOEIS[oeisID]['valuesTestValidation']:
-		standardizedEqualToCallableReturn(dictionaryOEIS[oeisID]['valuesKnown'][n], oeisIDfor_n, oeisID, n)
+	for n in dictionaryOEISMapFolding[oeisID]['valuesTestValidation']:
+		standardizedEqualToCallableReturn(dictionaryOEISMapFolding[oeisID]['valuesKnown'][n], oeisIDfor_n, oeisID, n)
+
+def test_aOFn_calculate_value_meanders(oeisIDMeanders: str) -> None:
+	"""Verify Meanders OEIS sequence value calculations against known reference values.
+
+	Tests the functions in `mapFolding.algorithms.oeisIDbyFormula` by comparing their
+	calculated output against known correct values from the OEIS database for Meanders IDs.
+
+	Parameters
+	----------
+	oeisIDMeanders : str
+		The Meanders OEIS sequence identifier to test calculations for.
+
+	"""
+	oeisIDcallable: Callable[[int], int] = getattr(oeisIDbyFormula, oeisIDMeanders)
+	for n in dictionaryOEISMeanders[oeisIDMeanders]['valuesTestValidation']:
+		standardizedEqualToCallableReturn(
+			dictionaryOEISMeanders[oeisIDMeanders]['valuesKnown'][n],
+			oeisIDcallable,
+			n,
+		)
 
 @pytest.mark.parametrize('flow', ['daoOfMapFolding', 'numba', 'theorem2', 'theorem2Numba', 'theorem2Trimmed'])
 def test_flowControl(mapShapeTestCountFolds: tuple[int, ...], flow: str) -> None:
@@ -104,14 +126,14 @@ def test_flowControlByOEISid(oeisID: str, flow: str) -> None:
 	mapShape = None
 
 	oeis_n = 2
-	for oeis_n in dictionaryOEIS[oeisID]['valuesTestValidation']:
+	for oeis_n in dictionaryOEISMapFolding[oeisID]['valuesTestValidation']:
 		if oeis_n < 2:
 			continue
 
 		if oeisID in dictionaryOEISMeanders:
 			expected = dictionaryOEISMeanders[oeisID]['valuesKnown'][oeis_n]
 		else:
-			expected = dictionaryOEIS[oeisID]['valuesKnown'][oeis_n]
+			expected = dictionaryOEISMapFolding[oeisID]['valuesKnown'][oeis_n]
 
 		standardizedEqualToCallableReturn(
 			expected

mapFolding/tests/test_oeis.py

@@ -26,7 +26,7 @@ which is crucial for maintaining package reliability in production environments.
 
 from contextlib import redirect_stdout
 from mapFolding.oeis import (
-	_standardizeOEISid, clearOEIScache, dictionaryOEIS, getOEISids, OEIS_for_n, oeisIDfor_n, oeisIDsImplemented)
+	_standardizeOEISid, dictionaryOEISMapFolding, getOEISids, OEIS_for_n, oeisIDfor_n, oeisIDsImplemented)
 from mapFolding.tests.conftest import standardizedEqualToCallableReturn, standardizedSystemExit
 from typing import Any
 import io
@@ -57,24 +57,6 @@ def test_aOFn_invalid_n(oeisID_1random: str, badN: Any) -> None:
 def test_aOFn_zeroDim_A001418() -> None:
 	standardizedEqualToCallableReturn(ArithmeticError, oeisIDfor_n, 'A001418', 0)
 
-# ===== OEIS Cache Tests =====
-@pytest.mark.parametrize("cacheExists", [True, False])
-@unittest.mock.patch('pathlib.Path.exists')
-@unittest.mock.patch('pathlib.Path.unlink')
-def test_clearOEIScache(mock_unlink: unittest.mock.MagicMock, mock_exists: unittest.mock.MagicMock, cacheExists: bool) -> None:
-	"""Test OEIS cache clearing with both existing and non-existing cache."""
-	mock_exists.return_value = cacheExists
-	clearOEIScache()
-
-	if cacheExists:
-		# Each OEIS ID has two cache files
-		expected_calls = len(dictionaryOEIS) * 2
-		assert mock_unlink.call_count == expected_calls
-		mock_unlink.assert_has_calls([unittest.mock.call(missing_ok=True)] * expected_calls)
-	else:
-		mock_exists.assert_called_once()
-		mock_unlink.assert_not_called()
-
 # ===== Command Line Interface Tests =====
 def testHelpText() -> None:
 	"""Test that help text is complete and examples are valid."""
@@ -87,7 +69,7 @@ def testHelpText() -> None:
 	# Verify content
 	for oeisID in oeisIDsImplemented:
 		assert oeisID in helpText
-		assert dictionaryOEIS[oeisID]['description'] in helpText
+		assert dictionaryOEISMapFolding[oeisID]['description'] in helpText
 
 	# Extract and verify examples
 

{mapfolding-0.15.3.dist-info → mapfolding-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapFolding
-Version: 0.15.3
+Version: 0.15.4
 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

{mapfolding-0.15.3.dist-info → mapfolding-0.15.4.dist-info}/RECORD

@@ -1,38 +1,16 @@
-mapFolding/__init__.py,sha256=UqUsMLADRoBiWI7YTwQqdP7gnoQ2HrerquHXPRTPeFM,3703
-mapFolding/_theSSOT.py,sha256=nmZF-licd9nBMEFD8o-7M8eMIRMKJsxB6IokVWSpa0Y,4832
-mapFolding/_theTypes.py,sha256=BQnby53q7cbX11yOHXTW663R6ODHRoDGZqVCUN3v2Bo,3683
-mapFolding/basecamp.py,sha256=kn_agLy_kQj0OxGdjxr5hp2S8lKaL2XJFrHQiktBLzI,12984
+mapFolding/__init__.py,sha256=6iou-H1W0rZdGmo7WjLwdYbR44fP_hVxeT2vjLh9e_A,3965
+mapFolding/_theSSOT.py,sha256=SoG6tKzhjpc7gnG1b3qLfpXiT2_GR3yYTWMpble6If4,5224
+mapFolding/_theTypes.py,sha256=F2pCHexrlbHTgMpQn58jDhkwAMFUSBp28gQp21n86o0,6559
+mapFolding/basecamp.py,sha256=TITldxLm889eqBPXmlAilbC6Bmi_QNafzaLWYe1jptg,15755
 mapFolding/beDRY.py,sha256=iYATcrYrAWkKaAecjA_awELBtZP5Q3snU4053dIsEwU,13941
-mapFolding/daoOfMapFolding.py,sha256=yLqaAqMwHIVFAtig3T46aZZQLAjCtQzYoAi0iMs_2CY,5482
 mapFolding/dataBaskets.py,sha256=04tVULSbWbPkKkLjTofWfVOr6gWcs38XILvU0-ftHIU,15191
 mapFolding/filesystemToolkit.py,sha256=Ex5tyugRQurXIgUNVtkQYfWMq8fM4e-izX01MBXU5_8,11006
-mapFolding/oeis.py,sha256=nP_-cSNMkEsC0VWD93AqTO4lA7VFfkVsG-c3DnkwsaU,19093
+mapFolding/oeis.py,sha256=f9yywOQzvdG8ofqmRL1_-1BlO8rgo4TdEo6VyXHiJNw,18639
 mapFolding/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mapFolding/_oeisFormulas/A000136.py,sha256=G_vqOdb6s_YBbrCkHKjQDnlYfOZ4suXRtie6bRI7hhE,105
-mapFolding/_oeisFormulas/A000560.py,sha256=sN5-BAjL0oDk7YXZ2kx7ffBDX-gC28mmOj4CxHkM36c,113
-mapFolding/_oeisFormulas/A000682.py,sha256=rO37K3iBVg6iLPhJtiPnl5LK5A2CoTHmV2U4rAPZzIc,3415
-mapFolding/_oeisFormulas/A001010.py,sha256=-QjtVNo34EqOeQjOufuI32b7e6gn1aj5I5j_I_aAlyo,431
-mapFolding/_oeisFormulas/A001011.py,sha256=IlPvOdz0tSGSKTxKXTFYD41fO1N0TtUwwgvewbbteQs,177
-mapFolding/_oeisFormulas/A005315.py,sha256=g1P52zUuWCLFbTb_i6U75sVzXfUGaCM3rJonXNRgVr4,109
-mapFolding/_oeisFormulas/A005316.py,sha256=3B4_2TT_ip3CcYngEaFS-rTNDx-x2TZ0r_J0f8IMJbQ,234
-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=aH0SEXnmnW_U7kJZLqu7IwLz06rNyT9Qo3631fgVDX0,1096
-mapFolding/_oeisFormulas/Z0Z_notes.py,sha256=V1w42d1loZJ_Zu3TneViZDqsJPFaPuGuyvbYe0cdWf8,1060
-mapFolding/_oeisFormulas/Z0Z_oeisMeanders.py,sha256=pN2cawDvwpN-uSkgKqpOk2ddr8bg38ZOjVd6WMI4wC0,2785
-mapFolding/_oeisFormulas/Z0Z_symmetry.py,sha256=hgI-79X3BeG3tT4MOU2XXEHfWq53G3Sr0YpviRFg2rI,4173
-mapFolding/_oeisFormulas/__init__.py,sha256=n83beVb7HHplXYAM5HveaIAuR7KrJG99OaNHJGMb_uc,44
-mapFolding/_oeisFormulas/matrixMeanders.py,sha256=84EYLaILzF683nBt644AEf3-EtxfFuZ-DBV1NNP3wWA,7602
-mapFolding/_oeisFormulas/matrixMeanders64.py,sha256=7JVkfzjNP7xYkK5VM_ahPoJ1bu1tD4BlFCGggSHocas,9253
-mapFolding/_oeisFormulas/matrixMeandersAnnex.py,sha256=ly4ZTMxdAffHCsIjiembakIDyMiRjAfj1MSZMzsCP9E,5754
-mapFolding/reference/A005316JavaPort.py,sha256=6qqTzbD3PTwYGtqaywEURGXtNFx1lp8ofEwpQeEvAHc,4899
-mapFolding/reference/A005316imperative.py,sha256=hhjUxELOktNBmHrwIoxVA-mcFsOWgg01p780OBeqL04,3816
-mapFolding/reference/A005316intOptimized.py,sha256=oO9ktdYeFwtosVp5KliwH8JmCSxfjapjBM1iMECuDAc,4121
-mapFolding/reference/A005316optimized128bit.py,sha256=6JxmVBIQnN0rH0MQIZtu_wgY1Wbms8hZCWarMe5NLLU,3416
-mapFolding/reference/A005316primitiveOptimized.py,sha256=iFig6Edv1E774xrlVUFLyscC40DqDhV-oh4hOnG2DLI,4116
-mapFolding/reference/A005316redis.py,sha256=MPeiobrs3VsNZOOKYBg52oVp0OjVDzLEdsRKfrZ9LrU,4328
-mapFolding/reference/A005316write2disk.py,sha256=NMVrdhe5KhnXQfaQ5Xr7Pwl5oXYEOM1DrMISDDOCVVw,5633
+mapFolding/algorithms/__init__.py,sha256=gARPqfySaeSWMfApQ5wSxzy7ZdgLdKYsLqsRSEYWwWI,28
+mapFolding/algorithms/daoOfMapFolding.py,sha256=yLqaAqMwHIVFAtig3T46aZZQLAjCtQzYoAi0iMs_2CY,5482
+mapFolding/algorithms/matrixMeanders.py,sha256=XLcaiUH66PlIzEQb4bD7oZpWjFGxysnj_w-KiXxIj5E,20740
+mapFolding/algorithms/oeisIDbyFormula.py,sha256=Ke1SOVGzE3uDq0tAS2kHzo8AtT_tntmXpgcizNx6DVs,2889
 mapFolding/reference/__init__.py,sha256=GKcSgYE49NcTISx-JZbELXyq-eRkMeTL5g4DXInWFw0,2206
 mapFolding/reference/flattened.py,sha256=0eHgLFIeIeVUsI5zF5oSy5iWYrjOMzxr7KjDxiTe01k,16078
 mapFolding/reference/hunterNumba.py,sha256=iLfyqwGdAh6c5GbapnKsWhAsNsR3O-fyGGHAdohluLw,7258
@@ -40,16 +18,24 @@ mapFolding/reference/irvineJavaPort.py,sha256=XnsL4g33LRrYwAhcrAVt-ujsP6QD6fbyCs
 mapFolding/reference/jaxCount.py,sha256=t8ons45zyWNJQ-nmn1qbhNsTkTnRzf7ATauaYvIlkRI,14853
 mapFolding/reference/lunnonNumpy.py,sha256=mMgrgbrBpe4nmo72ThEI-MGH0OwEHmfMPczSXHp2qKo,4357
 mapFolding/reference/lunnonWhile.py,sha256=ZL8GAQtPs5nJZSgoDl5USrLSS_zs03y98y1Z9E4jOmQ,3799
-mapFolding/reference/matrixMeandersBaseline.py,sha256=8Z98MMfhTCdoa75HWZz4DO166EiHZCu5eHeFzhgK42s,3003
-mapFolding/reference/matrixMeandersBaselineAnnex.py,sha256=d2Oh4JZxz53ox_ArhIxpMTOuA7rtE9wnEPojpFcnlfc,5817
-mapFolding/reference/matrixMeandersBaselineV2.py,sha256=VpRiIGhnk-DbxwsHwCeCwXqcKLSNyHl-iRGLDH9ZGMY,7674
-mapFolding/reference/matrixMeandersSimpleQueue.py,sha256=pOfaS315OKIBG9GSqSJwUDcEhfnV2XduM9IPqHrBvJg,4083
-mapFolding/reference/matrixMeandersSlicePop.py,sha256=XyiesSQAH1dRplYx_CdR1FzcXvgmmxzj27V4aIqPp7o,5353
 mapFolding/reference/rotatedEntryPoint.py,sha256=3IJU7Hc2PDSE71wmSkDs4Z3t0Px9NBSzmCsVrgQuQyU,10274
 mapFolding/reference/total_countPlus1vsPlusN.py,sha256=yJZAVLVdoXqHag2_N6_6CT-Q6HXBgRro-eny93-Rlpw,9307
 mapFolding/reference/jobsCompleted/__init__.py,sha256=TU93ZGUW1xEkT6d9mQFn_rp5DvRy0ZslEB2Q6MF5ZDc,2596
 mapFolding/reference/jobsCompleted/[2x19]/p2x19.py,sha256=_tvYtfzMWVo2VtUbIAieoscb4N8FFflgTdW4-ljBUuA,19626
 mapFolding/reference/jobsCompleted/p2x19/p2x19.py,sha256=eZEw4Me4ocTt6VXoK2-Sbd5SowZtxRIbN9dZmc7OCVg,6395
+mapFolding/reference/meandersDumpingGround/A005316JavaPort.py,sha256=6qqTzbD3PTwYGtqaywEURGXtNFx1lp8ofEwpQeEvAHc,4899
+mapFolding/reference/meandersDumpingGround/A005316imperative.py,sha256=hhjUxELOktNBmHrwIoxVA-mcFsOWgg01p780OBeqL04,3816
+mapFolding/reference/meandersDumpingGround/A005316intOptimized.py,sha256=oO9ktdYeFwtosVp5KliwH8JmCSxfjapjBM1iMECuDAc,4121
+mapFolding/reference/meandersDumpingGround/A005316optimized128bit.py,sha256=6JxmVBIQnN0rH0MQIZtu_wgY1Wbms8hZCWarMe5NLLU,3416
+mapFolding/reference/meandersDumpingGround/A005316primitiveOptimized.py,sha256=iFig6Edv1E774xrlVUFLyscC40DqDhV-oh4hOnG2DLI,4116
+mapFolding/reference/meandersDumpingGround/A005316redis.py,sha256=MPeiobrs3VsNZOOKYBg52oVp0OjVDzLEdsRKfrZ9LrU,4328
+mapFolding/reference/meandersDumpingGround/A005316write2disk.py,sha256=NMVrdhe5KhnXQfaQ5Xr7Pwl5oXYEOM1DrMISDDOCVVw,5633
+mapFolding/reference/meandersDumpingGround/matrixMeanders64retired.py,sha256=oRVgf6zkWRjk7dWR-Px41M_5spdvKy_Pich0qd7oxVA,9270
+mapFolding/reference/meandersDumpingGround/matrixMeandersBaseline.py,sha256=8Z98MMfhTCdoa75HWZz4DO166EiHZCu5eHeFzhgK42s,3003
+mapFolding/reference/meandersDumpingGround/matrixMeandersBaselineAnnex.py,sha256=d2Oh4JZxz53ox_ArhIxpMTOuA7rtE9wnEPojpFcnlfc,5817
+mapFolding/reference/meandersDumpingGround/matrixMeandersBaselineV2.py,sha256=VpRiIGhnk-DbxwsHwCeCwXqcKLSNyHl-iRGLDH9ZGMY,7674
+mapFolding/reference/meandersDumpingGround/matrixMeandersSimpleQueue.py,sha256=pOfaS315OKIBG9GSqSJwUDcEhfnV2XduM9IPqHrBvJg,4083
+mapFolding/reference/meandersDumpingGround/matrixMeandersSlicePop.py,sha256=XyiesSQAH1dRplYx_CdR1FzcXvgmmxzj27V4aIqPp7o,5353
 mapFolding/someAssemblyRequired/A007822rawMaterials.py,sha256=_IeOaxuA3IoHzsrm7qRPO_M1ZT09ATLJl7xpTXiqg8E,1697
 mapFolding/someAssemblyRequired/RecipeJob.py,sha256=yGGPHq9JX-Gf7QlJz50EPpkO7sADwGvSZNA1aC_F_PQ,9866
 mapFolding/someAssemblyRequired/__init__.py,sha256=UNDh6O86jT5ywlw9LgeWsUHwOfNvoMJRDAzYXbwCbeM,5779
@@ -57,14 +43,14 @@ mapFolding/someAssemblyRequired/_toolIfThis.py,sha256=VDZC10Xo3E1Y5n6FmaBBbOBR-r
 mapFolding/someAssemblyRequired/_toolkitContainers.py,sha256=Xbo1QJT8KtrWcAvQ-eLzOEzR8N78WfF43fJKGRIebA4,13625
 mapFolding/someAssemblyRequired/getLLVMforNoReason.py,sha256=tY0-2K0BFkwLAAjSrFJLPoG8CevDHOFc3OH3TxXANzg,2806
 mapFolding/someAssemblyRequired/infoBooth.py,sha256=GWiqnHbqk7te_pvVuk4G_gbFa_W2aeSx19w4pakvqfM,2300
-mapFolding/someAssemblyRequired/makeAllModules.py,sha256=mNIT-qUJt75qJLTCVElbZPIZNH36qOG3akAJ57JerTo,44490
+mapFolding/someAssemblyRequired/makeAllModules.py,sha256=V-vjzHQsD4O2SP--zCik7y7eblKZNPgU9CrUKZ7wAwY,44530
 mapFolding/someAssemblyRequired/makeJobTheorem2Numba.py,sha256=wflkPttFID9vao4C4CohoUCYgbMWD7GhZ7TO9h5mwtE,17196
 mapFolding/someAssemblyRequired/makeJobTheorem2codon.py,sha256=JasXcDMBVO1t0m84z1Q3T30dIZCteLsxVUK0QL3jYdA,11495
 mapFolding/someAssemblyRequired/toolkitNumba.py,sha256=nCCVsGidAlcKRVAvA__hu4bXtat3B-cO9YloKtqOAc4,14919
 mapFolding/someAssemblyRequired/transformationTools.py,sha256=nPGZsvb5GquaCCxdDh_XzNIZYSiVJpWKd7wfhfRvxnk,11512
 mapFolding/syntheticModules/__init__.py,sha256=evVFqhCGa-WZKDiLcnQWjs-Bj34eRnfSLqz_d7dFYZY,83
 mapFolding/syntheticModules/algorithmA007822.py,sha256=rJHwImwcFGAysYoNME79qmNhoa3ebRgXb7ktKZLtSZ8,7074
-mapFolding/syntheticModules/algorithmA007822Numba.py,sha256=k7w-TicOkjV05bYPNK5s0kzWrBzS3EfVfQafZxBBa1Q,7222
+mapFolding/syntheticModules/algorithmA007822Numba.py,sha256=Ae_UZ2My56GJZ8ZA6WSeLWb7Rml3tcgxpY7r6-lTP6Y,7228
 mapFolding/syntheticModules/countParallelNumba.py,sha256=6sHWzGc6ch3HjKVB8krvaBec_KoHv3gpfN_F5Vl1SP8,7870
 mapFolding/syntheticModules/daoOfMapFoldingNumba.py,sha256=5oMb8pttNKslN6wss9JIQXSnmjgE2q_2-3fIrh1pEW0,6033
 mapFolding/syntheticModules/dataPacking.py,sha256=SzRmDNr2OZP6Xk4krLqxTuWAUtUJxBDXmHEqlBHzNPI,2407
@@ -78,15 +64,15 @@ mapFolding/syntheticModules/theorem2A007822Trimmed.py,sha256=ekbKQ_FIZgaQ9m7NrxD
 mapFolding/syntheticModules/theorem2Numba.py,sha256=AFe-KI97ilPgPFA22ASAhfUetaTA249K7By_vqu1Crs,3416
 mapFolding/syntheticModules/theorem2Trimmed.py,sha256=geKX3So1SqhENlKeEO2dV6S3rGsxBp-AItB4hRbwbBI,2699
 mapFolding/tests/__init__.py,sha256=QVCHSMFVvTxV3mAyYOLkMFAFyBJ514zdoVnDmpBJnTo,1336
-mapFolding/tests/conftest.py,sha256=IveGDDJrdbeyf4gZ7-V_3WGAzKkMfwu8mksRe8ZSZCs,14625
-mapFolding/tests/test_computations.py,sha256=tCrJCYT2akUu_jYJudL4jZWRTTEwDMF5mOyxILSSOyM,7465
+mapFolding/tests/conftest.py,sha256=fLBZFStVJEIfbt6PQNVyAEdMVyck_lwhEB0eZYgQSwU,15255
+mapFolding/tests/test_computations.py,sha256=OTKnDqNOrTLhkfkoq0NX5veEsGQPlz140SROBWHI8U0,8297
 mapFolding/tests/test_filesystem.py,sha256=0rYQ62f4e3HOoymXrxDWbqNEBJQ7DGN8RUOMI84tE2Q,3892
-mapFolding/tests/test_oeis.py,sha256=ejqaOMB61c1oUEBblPPBG9hFFXffpKuIS0CJMe7Rd1o,5497
+mapFolding/tests/test_oeis.py,sha256=qwi9z_BnpeGO4QwTHj_WOiP21gf2rUgDdxhc90zWsl8,4754
 mapFolding/tests/test_other.py,sha256=ScBiJ78LnyAaW-RhxcouX6Xw10wgpSdqfvT4LO3WjnQ,4766
 mapFolding/tests/test_tasks.py,sha256=_pr9JRWjjNKA7sww70XvkJJdGPruBVzubM63RmD_Du0,4013
-mapfolding-0.15.3.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
-mapfolding-0.15.3.dist-info/METADATA,sha256=IAmZt0STmU9jkM-hIf80G1FJgDvIS25698U9tAkgHI4,5234
-mapfolding-0.15.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mapfolding-0.15.3.dist-info/entry_points.txt,sha256=F3OUeZR1XDTpoH7k3wXuRb3KF_kXTTeYhu5AGK1SiOQ,146
-mapfolding-0.15.3.dist-info/top_level.txt,sha256=aG3bjFBoxxuaV3Iu1wZAd241Ubs3cdaJtKYBQBDIjsg,11
-mapfolding-0.15.3.dist-info/RECORD,,
+mapfolding-0.15.4.dist-info/licenses/LICENSE,sha256=NxH5Y8BdC-gNU-WSMwim3uMbID2iNDXJz7fHtuTdXhk,19346
+mapfolding-0.15.4.dist-info/METADATA,sha256=BXwMx_DXwPRzBfAXUWNsBUVp71OvXFIXkpOuToAOYqs,5234
+mapfolding-0.15.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mapfolding-0.15.4.dist-info/entry_points.txt,sha256=-mH9DjW9tDRMPaeoSWKKywG35cR28m12H_jtmrB4eY8,98
+mapfolding-0.15.4.dist-info/top_level.txt,sha256=aG3bjFBoxxuaV3Iu1wZAd241Ubs3cdaJtKYBQBDIjsg,11
+mapfolding-0.15.4.dist-info/RECORD,,

{mapfolding-0.15.3.dist-info → mapfolding-0.15.4.dist-info}/entry_points.txt

@@ -1,4 +1,3 @@
 [console_scripts]
 OEIS_for_n = mapFolding.oeis:OEIS_for_n
-clearOEIScache = mapFolding.oeis:clearOEIScache
 getOEISids = mapFolding.oeis:getOEISids

mapFolding/_oeisFormulas/A000136.py

@@ -1,4 +0,0 @@
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A000136(n: int) -> int:
-	return n * A000682(n)

mapFolding/_oeisFormulas/A000560.py

@@ -1,4 +0,0 @@
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A000560(n: int) -> int:
-    return A000682(n + 1) // 2

mapFolding/_oeisFormulas/A000682.py

@@ -1,85 +0,0 @@
-"""Semi-meanders.
-
-n = 3   `startingCurveLocations` keys = 3
-n = 4   `startingCurveLocations` keys = 4
-n = 5   `startingCurveLocations` keys = 4
-n = 6   `startingCurveLocations` keys = 5
-n = 7   `startingCurveLocations` keys = 5
-n = 8   `startingCurveLocations` keys = 6
-n = 9   `startingCurveLocations` keys = 6
-n = 10  `startingCurveLocations` keys = 7
-n = 11  `startingCurveLocations` keys = 7
-n = 12  `startingCurveLocations` keys = 8
-n = 13  `startingCurveLocations` keys = 8
-n = 14  `startingCurveLocations` keys = 9
-n = 15  `startingCurveLocations` keys = 9
-n = 16  `startingCurveLocations` keys = 10
-n = 17  `startingCurveLocations` keys = 10
-n = 18  `startingCurveLocations` keys = 11
-n = 19  `startingCurveLocations` keys = 11
-n = 20  `startingCurveLocations` keys = 12
-n = 21  `startingCurveLocations` keys = 12
-n = 22  `startingCurveLocations` keys = 13
-n = 23  `startingCurveLocations` keys = 13
-n = 24  `startingCurveLocations` keys = 14
-n = 25  `startingCurveLocations` keys = 14
-n = 26  `startingCurveLocations` keys = 15
-n = 27  `startingCurveLocations` keys = 15
-n = 28  `startingCurveLocations` keys = 16
-n = 29  `startingCurveLocations` keys = 16
-n = 30  `startingCurveLocations` keys = 17
-n = 31  `startingCurveLocations` keys = 17
-n = 32  `startingCurveLocations` keys = 18
-n = 33  `startingCurveLocations` keys = 18
-n = 34  `startingCurveLocations` keys = 19
-n = 35  `startingCurveLocations` keys = 19
-n = 36  `startingCurveLocations` keys = 20
-n = 37  `startingCurveLocations` keys = 20
-n = 38  `startingCurveLocations` keys = 21
-n = 39  `startingCurveLocations` keys = 21
-n = 40  `startingCurveLocations` keys = 22
-n = 41  `startingCurveLocations` keys = 22
-n = 42  `startingCurveLocations` keys = 23
-n = 43  `startingCurveLocations` keys = 23
-n = 44  `startingCurveLocations` keys = 24
-n = 45  `startingCurveLocations` keys = 24
-n = 46  `startingCurveLocations` keys = 25
-n = 47  `startingCurveLocations` keys = 25
-n = 48  `startingCurveLocations` keys = 26
-n = 49  `startingCurveLocations` keys = 26
-n = 50  `startingCurveLocations` keys = 27
-n = 51  `startingCurveLocations` keys = 27
-n = 52  `startingCurveLocations` keys = 28
-n = 53  `startingCurveLocations` keys = 28
-n = 54  `startingCurveLocations` keys = 29
-n = 55  `startingCurveLocations` keys = 29
-n = 56  `startingCurveLocations` keys = 30
-n = 57  `startingCurveLocations` keys = 30
-n = 58  `startingCurveLocations` keys = 31
-n = 59  `startingCurveLocations` keys = 31
-n = 60  `startingCurveLocations` keys = 32
-n = 61  `startingCurveLocations` keys = 32
-"""
-
-# TODO figure out how to call the correct module
-# In other situations, I use a so-called dispatcher amd that has helped make code transformation easier, too.
-from mapFolding._oeisFormulas.matrixMeanders import count  # noqa: ERA001
-from mapFolding._oeisFormulas.matrixMeanders64 import count as count64
-
-def initializeA000682(n: int) -> dict[int, int]:
-	curveLocationsMAXIMUM = 1 << (2 * n + 4)
-
-	curveSeed: int = 5 - (n & 0b1) * 4
-	listCurveLocations = [(curveSeed << 1) | curveSeed]
-
-	while listCurveLocations[-1] < curveLocationsMAXIMUM:
-		curveSeed = (curveSeed << 4) | 0b101
-		listCurveLocations.append((curveSeed << 1) | curveSeed)
-
-	return dict.fromkeys(listCurveLocations, 1)
-
-def A000682(n: int) -> int:
-	# count64(n - 1, initializeA000682(n - 1))
-	# print()
-	return count(n - 1, initializeA000682(n - 1))
-	# return count64(n - 1, initializeA000682(n - 1))

mapFolding/_oeisFormulas/A001010.py

@@ -1,19 +0,0 @@
-from mapFolding import countFolds
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A001010(n: int) -> int:
-	"""Complicated.
-
-	a(2n-1) = 2*A007822(n)
-	OddQ[n], 2*A007822[[(n - 1)/2 + 1]]]
-
-	a(2n) = 2*A000682(n+1)
-	EvenQ[n], 2*A000682[[n/2 + 1]]
-	"""
-	if n & 0b1:
-		foldsTotal = 2 * countFolds(oeisID='A007822', oeis_n=(n - 1)//2 + 1, flow='theorem2Numba')
-	else:
-		foldsTotal = 2 * A000682(n // 2 + 1)
-
-	return foldsTotal
-

mapFolding/_oeisFormulas/A001011.py

@@ -1,5 +0,0 @@
-from mapFolding._oeisFormulas.A000136 import A000136
-from mapFolding._oeisFormulas.A001010 import A001010
-
-def A001011(n: int) -> int:
-    return (A001010(n) + A000136(n)) // 4

mapFolding/_oeisFormulas/A005315.py

@@ -1,4 +0,0 @@
-from mapFolding._oeisFormulas.A005316 import A005316
-
-def A005315(n: int) -> int:
-	return A005316(2 * n - 1)

mapFolding/_oeisFormulas/A005316.py

@@ -1,10 +0,0 @@
-from mapFolding._oeisFormulas.matrixMeanders import count
-
-def initializeA005316(n: int) -> dict[int, int]:
-	if n & 0b1:
-		return {22: 1}
-	else:
-		return {15: 1}
-
-def A005316(n: int) -> int:
-	return count(n-1, initializeA005316(n-1))

mapFolding/_oeisFormulas/A223094.py

@@ -1,7 +0,0 @@
-from mapFolding._oeisFormulas.A000136 import A000136
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A223094(n: int) -> int:
-    return A000136(n) - A000682(n + 1)
-
-# %F A223094 For n >= 3: a(n) = n! - Sum_{k=3..n-1} (a(k)*n!/k!) - A000682(n+1). - _Roger Ford_, Aug 24 2024

mapFolding/_oeisFormulas/A259702.py

@@ -1,4 +0,0 @@
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A259702(n: int) -> int:
-	return A000682(n) // 2 - A000682(n - 1)

mapFolding/_oeisFormulas/A301620.py

@@ -1,6 +0,0 @@
-from mapFolding._oeisFormulas.A000682 import A000682
-
-def A301620(n: int) -> int:
-	return A000682(n + 2) - 2 * A000682(n + 1)
-
-# %F A301620 a(n) = Sum_{k=3..floor((n+3)/2)} (A259689(n+1,k)*(k-2)). - _Roger Ford_, Dec 10 2018

mapFolding/_oeisFormulas/Z0Z_aOFn.py

@@ -1,34 +0,0 @@
-# pyright: reportUnusedImport=false
-from mapFolding._oeisFormulas.A000136 import A000136
-from mapFolding._oeisFormulas.A000682 import A000682
-from mapFolding._oeisFormulas.A001010 import A001010
-from mapFolding._oeisFormulas.Z0Z_oeisMeanders import dictionaryOEISMeanders
-from mapFolding.oeis import dictionaryOEIS
-import sys
-import time
-
-# ruff: noqa: ERA001
-
-if __name__ == '__main__':
-	def _write() -> None:
-		sys.stdout.write(
-			f"{(booleanColor:=(foldsTotal == dictionaryOEISMeanders[oeisID]['valuesKnown'][n]))}\t" # pyright: ignore[reportIndexIssue, reportUnknownVariableType]
-			f"\033[{(not booleanColor)*91}m"
-			f"{n}\t"
-			f"{foldsTotal}\t"
-			# f"{dictionaryOEISMeanders[oeisID]['valuesKnown'][n]=}\t"
-			f"{time.perf_counter() - timeStart:.2f}\t"
-			# f"{description}\t"
-			"\033[0m\n"
-		)
-	oeisID = 'A001010'
-	oeisID = 'A000136'
-	oeisID = 'A000682'
-	for n in range(3,17):
-
-		# sys.stdout.write(f"{n = }\n")
-
-		timeStart = time.perf_counter()
-		foldsTotal = eval(oeisID)(n)  # noqa: S307
-		# sys.stdout.write(f"{n} {foldsTotal} {time.perf_counter() - timeStart:.2f}\n")
-		_write()

mapFolding/_oeisFormulas/Z0Z_notes.py

@@ -1,16 +0,0 @@
-"""Half-formed thoughts.
-
-I have unintentionally made `bridges -= 1` almost meaningless.
-
-Unlike multidimensional map folding, the computation of curveLocations_sub_i for bridges=p does not need to happen during the
-series of computation for bridges=p. Each curveLocations_sub_i produces between no curveLocations, curveLocations_sub_q,
-curveLocations_sub_r, curveLocations_sub_s, and curveLocations_sub_t, which are recorded as keys in dictionaryCurveLocations.
-
-`while bridges > 0: bridges -= 1` tacitly attaches metadata to each key in dictionaryCurveLocations: specifically the value of
-`bridges`. The computation is not complete until the `bridges` value of each key reaches 0.
-
-Therefore, it is hypothetically possible to use one dictionary and to explicitly track the `bridges` value for each key. In
-that scenario, the dictionary is effectively a list of jobs. And instead of being at the mercy of the amount of resources
-needed by each decrement, bridges -= 1, we can use well-researched techniques to manage resources and the order of
-execution.
-"""

mapFolding/_oeisFormulas/Z0Z_oeisMeanders.py

@@ -1,74 +0,0 @@
-from mapFolding._oeisFormulas.A000560 import A000560
-from mapFolding._oeisFormulas.A000682 import A000682
-from mapFolding._oeisFormulas.A001010 import A001010
-from mapFolding._oeisFormulas.A001011 import A001011
-from mapFolding._oeisFormulas.A005315 import A005315
-from mapFolding._oeisFormulas.A005316 import A005316
-from mapFolding._oeisFormulas.A223094 import A223094
-from mapFolding._oeisFormulas.A259702 import A259702
-from mapFolding._oeisFormulas.A301620 import A301620
-from mapFolding.oeis import getOEISidInformation, getOEISidValues
-from typing import TypedDict
-import sys
-
-oeisIDsMeanders: list[str] = [
-	'A000560',
-	'A000682',
-	'A001010',
-	'A001011',
-	'A005315',
-	'A005316',
-	'A223094',
-	'A259702',
-	'A301620',
-]
-
-# ruff: noqa: ERA001
-class MetadataOEISidMeanders(TypedDict):
-	"""Settings for an implemented OEIS sequence."""
-
-	description: str
-	"""The OEIS.org description of the integer sequence."""
-	# getMapShape: Callable[[int], tuple[int, ...]]
-	"""Function to convert the OEIS sequence index, 'n', to its `mapShape` tuple."""
-	offset: int
-	"""The starting index, 'n', of the sequence, typically 0 or 1."""
-	# valuesBenchmark: list[int]
-	"""List of index values, 'n', to use when benchmarking the algorithm performance."""
-	valuesKnown: dict[int, int]
-	"""Dictionary of sequence indices, 'n', to their known values, `foldsTotal`."""
-	# valuesTestParallelization: list[int]
-	"""List of index values, 'n', to use when testing parallelization performance."""
-	# valuesTestValidation: list[int]
-	"""List of index values, 'n', to use when testing validation performance."""
-	# valueUnknown: int
-	"""The smallest value of 'n' for for which `foldsTotal` is unknown."""
-
-dictionaryOEISMeanders: dict[str, MetadataOEISidMeanders] = {
-	oeisID: {
-		'description': getOEISidInformation(oeisID)[0],
-		'offset': getOEISidInformation(oeisID)[1],
-		'valuesKnown': getOEISidValues(oeisID),
-	}
-	for oeisID in oeisIDsMeanders
-}
-
-# ruff: noqa: S101
-# pyright: reportIndexIssue=false
-
-rangeTest = range(5, 13)
-
-if __name__ == '__main__':
-	for n in rangeTest:
-
-		assert A000560(n) == dictionaryOEISMeanders['A000560']['valuesKnown'][n]
-		assert A000682(n) == dictionaryOEISMeanders['A000682']['valuesKnown'][n]
-		assert A001010(n) == dictionaryOEISMeanders['A001010']['valuesKnown'][n]
-		assert A001011(n) == dictionaryOEISMeanders['A001011']['valuesKnown'][n]
-		assert A005315(n) == dictionaryOEISMeanders['A005315']['valuesKnown'][n]
-		assert A005316(n) == dictionaryOEISMeanders['A005316']['valuesKnown'][n]
-		assert A223094(n) == dictionaryOEISMeanders['A223094']['valuesKnown'][n]
-		assert A259702(n) == dictionaryOEISMeanders['A259702']['valuesKnown'][n]
-		assert A301620(n) == dictionaryOEISMeanders['A301620']['valuesKnown'][n]
-
-	sys.stdout.write(f"\nTrue for {str(rangeTest)}\n")