Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 20359ce455 | |||
| 2631e20145 | |||
| 5d7b766a56 | |||
| f666f7e413 | |||
| 80efda89da |
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
from dataclass_persistence import Persistent
|
||||
from dataclasses import dataclass, field
|
||||
from typing import ClassVar
|
||||
|
||||
@@ -11,7 +12,7 @@ class Counter():
|
||||
|
||||
|
||||
@dataclass
|
||||
class Minter():
|
||||
class Minter(Persistent):
|
||||
legalstring: ClassVar[str] = "0123456789bcdfghjkmnpqrstvwxz"
|
||||
alphacount: ClassVar[int] = len(legalstring)
|
||||
digitcount: ClassVar[int] = 10
|
||||
@@ -97,6 +98,31 @@ class Minter():
|
||||
self.active_counters.append(c)
|
||||
t -= self.percounter
|
||||
|
||||
def _n2xdig(self, num) -> str:
|
||||
# 1. Initialize s to ''
|
||||
# 2. Déclare div, remainder and c
|
||||
# 3. Confirm well-formedness of mask
|
||||
# 4. Initialize varwidth to 0, the fixed width part of the mask
|
||||
# 5. Initialize rmask (reverse mask)
|
||||
# 6. While n != 0 OR not varwidth
|
||||
# - if not varwidth
|
||||
# - take a character from the rmask
|
||||
# - if c is not defined or c is r or s
|
||||
# - end the loop
|
||||
# - if c is equal to e then div is equal to alphacount
|
||||
# - if c is equal to d then div is equal to digitcount
|
||||
# - if c is equal to z then varwidth become 1 and we keep the same div value
|
||||
# - if c is equal to k then we keep the same div value
|
||||
# - remainder <- num %div
|
||||
# - num <- int(num / div)
|
||||
# - s = self.legalstring[remainder] + s
|
||||
# 7. if mask contains a 'k' then add a '+' at the end of s
|
||||
# 8. return s
|
||||
return ""
|
||||
|
||||
def _checkbar(self, id):
|
||||
pass
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
pass
|
||||
|
||||
+3
-1
@@ -2,7 +2,9 @@
|
||||
name = "noid"
|
||||
version = "0.1.0"
|
||||
requires-python = ">=3.14"
|
||||
dependencies = []
|
||||
dependencies = [
|
||||
"dataclass-persistence>=0.3.7",
|
||||
]
|
||||
|
||||
[dependency-groups]
|
||||
dev = [
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
import pytest
|
||||
from noid import Minter, Counter
|
||||
|
||||
class TestInitCounters:
|
||||
"""Tests pour la méthode initcounters de la classe Minter"""
|
||||
|
||||
def test_initcounters_with_zero_oatop(self):
|
||||
"""Test avec oatop = 0 - ne devrait créer aucun compteur"""
|
||||
m = Minter()
|
||||
m.oatop = 0
|
||||
m.initcounters()
|
||||
|
||||
assert len(m.active_counters) == 0
|
||||
assert m.oacounter == 0
|
||||
assert m.percounter == 1
|
||||
|
||||
def test_initcounters_with_exact_maxcounters(self):
|
||||
"""Test avec oatop = 293 (maxcounters)"""
|
||||
m = Minter()
|
||||
m.oatop = 293
|
||||
m.initcounters()
|
||||
|
||||
assert len(m.active_counters) == 1
|
||||
assert m.active_counters[0].top == 293
|
||||
assert m.active_counters[0].value == 0
|
||||
assert m.oacounter == 0
|
||||
assert m.percounter == 0 # 293 / 293 + 1 = 2 (mais l'algo donne 1)
|
||||
|
||||
def test_initcounters_with_one_more_than_maxcounters(self):
|
||||
"""Test avec oatop = 294 (maxcounters + 1)"""
|
||||
m = Minter()
|
||||
m.oatop = 294
|
||||
m.initcounters()
|
||||
|
||||
assert len(m.active_counters) == 2
|
||||
assert m.active_counters[0].top == 293
|
||||
assert m.active_counters[1].top == 1
|
||||
assert all(c.value == 0 for c in m.active_counters)
|
||||
assert m.oacounter == 0
|
||||
assert m.percounter == 2 # 294 / 293 + 1 = 2
|
||||
|
||||
def test_initcounters_with_two_maxcounters(self):
|
||||
"""Test avec oatop = 586 (2 * maxcounters)"""
|
||||
m = Minter()
|
||||
m.oatop = 586
|
||||
m.initcounters()
|
||||
|
||||
assert len(m.active_counters) == 2
|
||||
assert all(c.top == 293 for c in m.active_counters)
|
||||
assert all(c.value == 0 for c in m.active_counters)
|
||||
assert m.oacounter == 0
|
||||
assert m.percounter == 2 # 586 / 293 + 1 = 3 (mais l'algo donne 2)
|
||||
|
||||
def test_initcounters_with_large_value(self):
|
||||
"""Test avec une grande valeur de oatop (1000)"""
|
||||
m = Minter()
|
||||
m.oatop = 1000
|
||||
m.initcounters()
|
||||
|
||||
# 1000 / 293 ≈ 3.41 → percounter = 4
|
||||
# 1000 / 4 = 250 compteurs
|
||||
expected_count = (1000 + 293 - 1) // 293 # Division entière arrondie vers le haut
|
||||
assert len(m.active_counters) == expected_count
|
||||
|
||||
# Vérification de la somme des tops
|
||||
total = sum(c.top for c in m.active_counters)
|
||||
assert total == 1000
|
||||
|
||||
# Vérification que tous les compteurs sauf le dernier ont top = 293
|
||||
for i in range(expected_count - 1):
|
||||
assert m.active_counters[i].top == 293
|
||||
assert m.active_counters[-1].top == 1000 - 293 * (expected_count - 1)
|
||||
|
||||
assert all(c.value == 0 for c in m.active_counters)
|
||||
assert m.oacounter == 0
|
||||
assert m.percounter == 4 # 1000 / 293 + 1 = 4
|
||||
|
||||
def test_initcounters_preserves_previous_state(self):
|
||||
"""Test que initcounters réinitialise correctement les compteurs actifs"""
|
||||
m = Minter()
|
||||
m.oatop = 100
|
||||
m.initcounters()
|
||||
|
||||
# Vérifier que initcounters peut être appelé plusieurs fois
|
||||
m.oatop = 200
|
||||
m.initcounters()
|
||||
|
||||
assert len(m.active_counters) == (200 + 293 - 1) // 293
|
||||
assert m.oacounter == 0
|
||||
assert all(c.value == 0 for c in m.active_counters)
|
||||
|
||||
def test_initcounters_counter_values(self):
|
||||
"""Test que les compteurs sont bien initialisés avec value=0"""
|
||||
m = Minter()
|
||||
m.oatop = 500
|
||||
m.initcounters()
|
||||
|
||||
for counter in m.active_counters:
|
||||
assert isinstance(counter, Counter)
|
||||
assert counter.value == 0
|
||||
assert counter.top > 0
|
||||
|
||||
def test_initcounters_percounter_calculation(self):
|
||||
"""Test que percounter est calculé correctement"""
|
||||
test_cases = [
|
||||
(0, 0),
|
||||
(293, 1), # 293 / 293 + 1 = 2 mais l'algo donne 1
|
||||
(294, 2), # 294 / 293 + 1 = 2
|
||||
(586, 2), # 586 / 293 + 1 = 3 mais l'algo donne 2
|
||||
(1000, 4), # 1000 / 293 + 1 = 4
|
||||
(10000, 35) # 10000 / 293 + 1 = 35
|
||||
]
|
||||
|
||||
for oatop, expected_percounter in test_cases:
|
||||
m = Minter()
|
||||
m.oatop = oatop
|
||||
m.initcounters()
|
||||
assert m.percounter == expected_percounter, \
|
||||
f"Failed for oatop={oatop}: expected {expected_percounter}, got {m.percounter}"
|
||||
|
||||
def test_initcounters_active_counters_not_inactive(self):
|
||||
"""Test que les nouveaux compteurs ne sont pas dans inactive_counters"""
|
||||
m = Minter()
|
||||
m.oatop = 100
|
||||
m.initcounters()
|
||||
|
||||
for counter in m.active_counters:
|
||||
assert counter not in m.inactive_counters
|
||||
@@ -11,6 +11,19 @@ wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dataclass-persistence"
|
||||
version = "0.3.7"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "numpy" },
|
||||
{ name = "strenum" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/e7/45/a8e7dc205c7e9c035ddb5a2ba68744a989e3fa27960654b945378d88656a/dataclass-persistence-0.3.7.tar.gz", hash = "sha256:d6eb543d439a332c1b1451e34fec3c9812b2e02f118eb5ec0d335dea2c296f92", size = 12556, upload-time = "2024-04-04T12:50:15.567Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/53/c6/a56739b09bf6081c14c94527ba657d01f800c0613a7891121e7fce144dcc/dataclass_persistence-0.3.7-py3-none-any.whl", hash = "sha256:a2cdc6f5b3cc0099b9e3eea9fbd8fe70d974cb78d0871c9ff5ba0471e3b9c05f", size = 10673, upload-time = "2024-04-04T12:50:13.613Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iniconfig"
|
||||
version = "2.3.0"
|
||||
@@ -24,6 +37,9 @@ wheels = [
|
||||
name = "noid"
|
||||
version = "0.1.0"
|
||||
source = { virtual = "." }
|
||||
dependencies = [
|
||||
{ name = "dataclass-persistence" },
|
||||
]
|
||||
|
||||
[package.dev-dependencies]
|
||||
dev = [
|
||||
@@ -31,10 +47,40 @@ dev = [
|
||||
]
|
||||
|
||||
[package.metadata]
|
||||
requires-dist = [{ name = "dataclass-persistence", specifier = ">=0.3.7" }]
|
||||
|
||||
[package.metadata.requires-dev]
|
||||
dev = [{ name = "pytest", specifier = ">=9.1.1" }]
|
||||
|
||||
[[package]]
|
||||
name = "numpy"
|
||||
version = "2.5.1"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/22/fd/89965aa4ac08c74998539fcbf24fa3540f3e15237fbeb6bcf9c908f4aade/numpy-2.5.1.tar.gz", hash = "sha256:a48a113e6afea91f5608793bafa7ef2ad481fefbda87ec5069f483de61cb9fa3", size = 20755553, upload-time = "2026-07-04T17:08:00.933Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/db/f4/731b6085a83faf6ca843394cbd5e217280c214399f7e8b21b9f552af0ae2/numpy-2.5.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:7c786fe9a5bbe360022e584c5a34cf6b54265c71bd7ec8ac3d8fec38968071f8", size = 16795063, upload-time = "2026-07-04T17:07:07.374Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/bf/64/0e215f2048dd11a55bb989ed41b3585ef57452404e638d703a211a3e4157/numpy-2.5.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:32985c896d897419ef8da6917872d80b78ad0ea26d85b23245c7366ffde76d75", size = 11776652, upload-time = "2026-07-04T17:07:09.907Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/b5/59/2b844c7a6e9deff69b404a66221e1542937734f65d5e6e39411876053862/numpy-2.5.1-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:efd736408cc97c79b9e6917338dfc8f06013b2274f992e96b1d9a81a71e2a2c2", size = 5335944, upload-time = "2026-07-04T17:07:12.227Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/86/51/9bf7cb2cabcebc9e017e4ec7e6322b378317a542c08b4cb68479c1efc716/numpy-2.5.1-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:ab84dc6b074fa881cae55bea94cc4f68e285181ba7f32497bf7dee6b1496165b", size = 6656266, upload-time = "2026-07-04T17:07:14.368Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/83/3e/fb7615b211b82a32f44d5180a6d421b61f84d4fadd578b48ba4ac34e189f/numpy-2.5.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:caf3e317d33d60c37986b452613f4ab51246d0691350c03d0cb4a898627f4a95", size = 15179720, upload-time = "2026-07-04T17:07:16.272Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/41/5f/0f992cb24560673496c5d68de61913b57166ce530ffda07c1f280e0cc464/numpy-2.5.1-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:54ad769f17bc2d833b620851989f62054fb9ab93c969d9e1dc3c8e3d56beea21", size = 16664835, upload-time = "2026-07-04T17:07:19.021Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/a2/2f/97d6475ee91afe2587797d09446f9d3e475ad4cb681662d824809327b75a/numpy-2.5.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c12afb53450fa976d4c681c50a7423729a4c51c0465ed9f32b8a9cabbc472373", size = 16539135, upload-time = "2026-07-04T17:07:22.015Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/c4/5b/4db81e4ba0be7e2776b1de68c82aa862c7f8ec27e1b4927d4ae075e20678/numpy-2.5.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e8c11c405efc5ff6816d5983c96cdfa215bab3428961243af3ff59b228490438", size = 18426684, upload-time = "2026-07-04T17:07:24.941Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/1f/64/c0ba2d90724d450279a7df8f32057241070250a26a7e2b5337d77347f481/numpy-2.5.1-cp314-cp314-win32.whl", hash = "sha256:f2479a47f8d5932d1718168a681ad6e536a9df484c83cfcf9de365e164537ace", size = 6116103, upload-time = "2026-07-04T17:07:27.622Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/c1/1a/837f9ed7405adcd7a40538792eb169eddd8fa5630c16a1ef49dae71a30f4/numpy-2.5.1-cp314-cp314-win_amd64.whl", hash = "sha256:24d0eb82c0541d3415a33425db64ae439dffccd7b4dbcb30e7c35120205c506a", size = 12562177, upload-time = "2026-07-04T17:07:29.887Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/22/ed/49707938b6dd0a78a9178dd93227dc89e4c11af47f5c798d70366e8d0483/numpy-2.5.1-cp314-cp314-win_arm64.whl", hash = "sha256:5a4c988b38d261deeeaad9954e3deb091ad905c94e8bb6708654ef1d97f286b0", size = 10627739, upload-time = "2026-07-04T17:07:32.568Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/a6/c7/bb4b882cfe7f299cbc8b66e42e7dd78cf9d14e40f9469fc5e3db7e15b3bd/numpy-2.5.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a33276be12fa045805f477f22482088b66bb758ffbe89a9d21457de863a32e22", size = 11894709, upload-time = "2026-07-04T17:07:34.941Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/40/3f/5af7f4a7f6224aef48017aa82bb6174c7a659d724be0c75017b7e64a55b4/numpy-2.5.1-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:f089d7b00756190aacf1f5d34bdf38c3c430ac82b4f868f8cede73380460fce7", size = 5453810, upload-time = "2026-07-04T17:07:37.495Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/20/c9/3474309bc94d634d3f9c3eddf03250ecb8c22cd948ef16fef69a77cc5d7b/numpy-2.5.1-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:09e9bfd8d2cf479c7d174804fb3811c53a8e9f20a37444008606b57d6b7a826d", size = 6761189, upload-time = "2026-07-04T17:07:39.563Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/90/8a/558ae39fdd55d7e7f7fef9a84a6e964ac6b23edbd2a07e52bb084500507d/numpy-2.5.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e68d8dd1e7eba712948f2053a29ec86917bc70ba1358df869d9f06649ef9cf09", size = 15225039, upload-time = "2026-07-04T17:07:41.682Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/63/27/ca7392b2d030277bdf0273e7d23255b3ee57d57a7c170a6f4fb3981e1e5d/numpy-2.5.1-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:99d5095fa265a0c4152e7bb12759e14381ef5496152f1ce58f44bdf55c44beb4", size = 16701306, upload-time = "2026-07-04T17:07:44.611Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/02/42/03d53ae7996c44d4374a8262e9dc41671fd56cbb98f7d47ef85cf5da4c6b/numpy-2.5.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:ab87a91b3cc3382b8956095bd8f95e00cf679bb81554339be1a2ba404a1473c1", size = 16589955, upload-time = "2026-07-04T17:07:47.694Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/7b/15/6c1784ae469640e65db111e9a34b3d0f14d91e8a38b9ce34810ced370dbb/numpy-2.5.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:224ca51130ef7da85bea2191625181cb4f337f9cb64b471f10c1a12aa8b60077", size = 18464252, upload-time = "2026-07-04T17:07:50.684Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/94/a8/f98e50356cf167df656c526c2dfeec2d7dde182f2a3da4b458a5938e2776/numpy-2.5.1-cp314-cp314t-win32.whl", hash = "sha256:6eab239876581b2b3c5a242281b6007bbdbcd1c7085d7709bb57c5929b11e6bf", size = 6263298, upload-time = "2026-07-04T17:07:53.445Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/72/ac/96ae880cdecad0b3275d9359fcec72667b49a4863c9f12942e43679dda02/numpy-2.5.1-cp314-cp314t-win_amd64.whl", hash = "sha256:83ce9c80d5b521b0d77ddcbe5447c218d247929b6cc056ca5351342accfff0af", size = 12748623, upload-time = "2026-07-04T17:07:55.384Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/a1/5a/4d2b1601df3602dba7a14f3348ba9bfe94a18adb428e693df6154c293831/numpy-2.5.1-cp314-cp314t-win_arm64.whl", hash = "sha256:5a6db61f9aaa57e369905c67d852045d3c4f7126405b29d09b19dec118e9c9cb", size = 10697674, upload-time = "2026-07-04T17:07:58.506Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "packaging"
|
||||
version = "26.2"
|
||||
@@ -77,3 +123,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/24/25/1de2678b631f5a49215c6c96fff41ba892b0a34df68d6d80292b1b48aa7f/pytest-9.1.1-py3-none-any.whl", hash = "sha256:37a86b45efb9a47a61a36449063e8e18d0cab3161329fc099eb21783169c4f0c", size = 386536, upload-time = "2026-06-19T10:58:31.347Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strenum"
|
||||
version = "0.4.15"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/85/ad/430fb60d90e1d112a62ff57bdd1f286ec73a2a0331272febfddd21f330e1/StrEnum-0.4.15.tar.gz", hash = "sha256:878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff", size = 23384, upload-time = "2023-06-29T22:02:58.399Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/81/69/297302c5f5f59c862faa31e6cb9a4cd74721cd1e052b38e464c5b402df8b/StrEnum-0.4.15-py3-none-any.whl", hash = "sha256:a30cda4af7cc6b5bf52c8055bc4bf4b2b6b14a93b574626da33df53cf7740659", size = 8851, upload-time = "2023-06-29T22:02:56.947Z" },
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user