Fix BasedReal resize mixed radix (#76)

ALFA-project-erc · Jun 30, 2022 · 0c86467 · 0c86467
1 parent 72debe0
commit 0c86467
Show file tree

Hide file tree

Showing 7 changed files with 326 additions and 285 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+    rev: 4.0.1
     hooks:
       - id: flake8
         exclude: docs
@@ -16,12 +16,12 @@ repos:
         args: ["--profile", "black", "--filter-files"]
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.950
+    rev: v0.960
     hooks:
       - id: mypy
         files: kanon

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+0.6.5
+_____
+
+*Bug Fixes*
+
+- radices : Fix `BasedReal.resize` sometimes not working on mixed radix `BasedReal`
+
 0.6.4
 _____
 

diff --git a/kanon/units/precision.py b/kanon/units/precision.py
@@ -179,7 +179,8 @@ def _get_significant(self: TPreciseNumber, other: "PreciseNumber") -> int:
     @_with_context_precision(symbol="+")
     def __add__(self: TPreciseNumber, other):
         if f := get_context().add:
-            return f(self, other)
+            with set_precision(**asdict(PrecisionContext())):
+                return f(self, other)
         return self._add(other)
 
     @abc.abstractmethod
@@ -189,7 +190,8 @@ def _add(self: TPreciseNumber, other: "PreciseNumber") -> TPreciseNumber:
     @_with_context_precision(symbol="-")
     def __sub__(self: TPreciseNumber, other):
         if f := get_context().sub:
-            return f(self, other)
+            with set_precision(**asdict(PrecisionContext())):
+                return f(self, other)
         return self._sub(other)
 
     @abc.abstractmethod
@@ -199,7 +201,8 @@ def _sub(self: TPreciseNumber, other: "PreciseNumber") -> TPreciseNumber:
     @_with_context_precision(symbol="*")
     def __mul__(self: TPreciseNumber, other):
         if f := get_context().mul:
-            return f(self, other)
+            with set_precision(**asdict(PrecisionContext())):
+                return f(self, other)
         return self._mul(other)
 
     @abc.abstractmethod
@@ -209,7 +212,8 @@ def _mul(self: TPreciseNumber, other: "PreciseNumber") -> TPreciseNumber:
     @_with_context_precision(symbol="/")
     def __truediv__(self: TPreciseNumber, other):
         if f := get_context().div:
-            return f(self, other)
+            with set_precision(**asdict(PrecisionContext())):
+                return f(self, other)
         return self._truediv(other)
 
     @abc.abstractmethod
@@ -425,6 +429,7 @@ def set_precision(
     sub: Union[CustomArithmeticAlgorithm, Literal[False]] = False,
     mul: Union[CustomArithmeticAlgorithm, Literal[False]] = False,
     div: Union[CustomArithmeticAlgorithm, Literal[False]] = False,
+    **kwargs,
 ):
     """Mutates the current `PrecisionContext` with the specified rules."""
     ctx = get_context()

diff --git a/kanon/units/radices.py b/kanon/units/radices.py
@@ -582,14 +582,17 @@ def resize(self: TBasedReal, significant: int) -> TBasedReal:
                 sign=self.sign,
             )
         if significant >= 0:
-            remainder = type(self)(
-                (), self.right[significant:], remainder=self.remainder
-            )
+            remainder = Decimal(0)
+            factor = Decimal(1)
+            for idx, number in enumerate(self.right[significant:]):
+                factor *= Decimal(self.base[1][significant + idx])
+                remainder += Decimal(number) / factor
+            remainder += self.remainder / factor
 
             return type(self)(
                 self.left,
                 self.right[:significant],
-                remainder=remainder.decimal,
+                remainder=remainder,
                 sign=self.sign,
             )
 

diff --git a/kanon/units/tests/test_basedreal.py b/kanon/units/tests/test_basedreal.py
@@ -11,6 +11,7 @@
 from hypothesis.core import given
 
 from kanon.units import BasedReal, Historical, Sexagesimal
+from kanon.units.definitions import Temporal
 from kanon.units.radices import (
     EmptyStringException,
     IllegalBaseValueError,
@@ -184,6 +185,9 @@ def test_misc():
 
     assert divmod(Sexagesimal(5), 3) == divmod(5, 3)
 
+    assert Temporal("1;2,44,44,44,44").resize(2).truncate() == Temporal("1;2,44")
+    assert Temporal("1;2,44,44,44,44").resize(0).truncate() == 1
+
 
 def test_shift():
     s = Sexagesimal("20, 1, 2, 30; 0")

diff --git a/kanon/units/tests/test_precision.py b/kanon/units/tests/test_precision.py
@@ -147,7 +147,7 @@ def div(a: PreciseNumber, b: PreciseNumber):
 
         with set_precision(add=add, sub=sub, div=div, mul=mul):
             assert Sexagesimal(1) + Sexagesimal(1) == 3
-            assert Sexagesimal(1) - Sexagesimal(1) == 0
+            assert Sexagesimal(1) - Sexagesimal(1) == -1
             assert Sexagesimal(1) * Sexagesimal(1) == 2
             assert Sexagesimal(1) / Sexagesimal(1) == 5
 
@@ -215,6 +215,10 @@ def func(a, b):
             func(Sexagesimal(1), Sexagesimal(2))
         assert func(1, 2) == 1
 
+    def test_test(self):
+        with set_precision(tmode=TruncatureMode.ROUND, pmode=1):
+            assert Sexagesimal("1;50") + Sexagesimal("2;5,30") == Sexagesimal("3;56")
+
     @classmethod
     def teardown_class(cls):
         get_context().mutate(**cls.context)