apexdevkit 1.18.4__tar.gz → 1.18.5__tar.gz

{apexdevkit-1.18.4 → apexdevkit-1.18.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apexdevkit
-Version: 1.18.4
+Version: 1.18.5
 Summary: Apex Development Tools for python.
 Author: Apex Dev
 Author-email: dev@apex.ge

apexdevkit-1.18.5/apexdevkit/value.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+import math
+from dataclasses import dataclass
+from decimal import Decimal
+
+
+@dataclass(frozen=True)
+class Value:
+    value: int = 0
+    exponent: int = 1
+
+    def as_decimal(self) -> Decimal:
+        return Decimal(self.value) / Decimal(self.exponent)
+
+    @classmethod
+    def from_string(cls, decimal_str: str) -> Value:
+        integer_part, _, fractional_part = decimal_str.partition(".")
+        value = int(integer_part + fractional_part)
+        exponent = 10 ** len(fractional_part)
+        return cls(value, exponent)
+
+    def add(self, other: Value) -> Value:
+        exponent = self.exponent * other.exponent
+        value = self.value * other.exponent + self.exponent * other.value
+        gcd = int(math.gcd(exponent, value))
+        return Value(int(value / gcd), int(exponent / gcd))
+
+    def subtract(self, other: Value) -> Value:
+        exponent = self.exponent * other.exponent
+        value = self.value * other.exponent - self.exponent * other.value
+        gcd = int(math.gcd(exponent, value))
+        return Value(int(value / gcd), int(exponent / gcd))
+
+    def multiply(self, other: Value) -> Value:
+        exponent = self.exponent * other.exponent
+        value = self.value * other.value
+        gcd = int(math.gcd(exponent, value))
+        return Value(int(value / gcd), int(exponent / gcd))
+
+    def divide(self, other: Value) -> Value:
+        exponent = self.exponent * other.value
+        value = self.value * other.exponent
+        gcd = int(math.gcd(exponent, value))
+        return Value(int(value / gcd), int(exponent / gcd))
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, Value):
+            return self.as_decimal() == other.as_decimal()
+        elif isinstance(other, Decimal):
+            return self.as_decimal() == other
+        return False

{apexdevkit-1.18.4 → apexdevkit-1.18.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apexdevkit"
-version = "1.18.4"
+version = "1.18.5"
 description = "Apex Development Tools for python."
 authors = ["Apex Dev <dev@apex.ge>"]
 readme = "README.md"

apexdevkit-1.18.4/apexdevkit/value.py

@@ -1,29 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from decimal import Decimal
-
-
-@dataclass(frozen=True)
-class Value:
-    value: int = 0
-    exponent: int = 1
-
-    def as_decimal(self) -> Decimal:
-        return Decimal(self.value) / Decimal(self.exponent)
-
-    @classmethod
-    def from_string(cls, decimal_str: str) -> Value:
-        integer_part, _, fractional_part = decimal_str.partition(".")
-        value = int(integer_part + fractional_part)
-        exponent = 10 ** len(fractional_part)
-        return cls(value, exponent)
-
-    def add(self, other: Value) -> Value:
-        return Value(self.value + self._adjusted(other), self.exponent)
-
-    def subtract(self, other: Value) -> Value:
-        return Value(self.value - self._adjusted(other), self.exponent)
-
-    def _adjusted(self, other: Value) -> int:
-        return int(Decimal(other.value) / Decimal(other.exponent) * self.exponent)