Accept native Python numbers in all math APIs; rename ratio.rs -> rational.rs

All numeric function/method arguments now go through UniInput so a plain Python
int/float works directly — dashu.sqrt(9.0), FBig(2).powi(300), UBig(12).gcd(8),
UBig(n) += 5, RBig.from_parts(1, 3), etc. (into_fpy now builds floats at f64's
native precision so transcendentals are well-defined). Rewrote the test suite to
use native Python types throughout. Renamed python/src/ratio.rs to rational.rs.
Also untracked the tests/__pycache__ artifacts and added a .gitignore.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: Jacob Zhong

python/.gitignore

@@ -0,0 +1,2 @@
+__pycache__/
+*.pyc

python/CHANGELOG.md

@@ -16,8 +16,11 @@
   `to_int`, `numerator`/`denominator`, `split_at_point`, `sqr`/`cubic`/`pow`.
 - Cross-type conversions: `FBig.to_decimal`/`to_binary`/`to_rational`,
   `RBig.to_float`/`to_decimal`.
-- `powi`, `from_parts`, and `ilog` now accept a plain Python `int` (or a dashu
-  integer) via the `UniInput` dispatch, so e.g. `FBig(12).powi(300)` works.
+- All numeric function/method arguments now accept plain Python numbers via the
+  `UniInput` dispatch — e.g. `dashu.sqrt(9.0)`, `FBig(2).powi(300)`, `UBig(12).gcd(8)`,
+  `UBig(n) += 5`, `RBig.from_parts(1, 3)`. The module-level `math` functions, `powf`,
+  `atan2`, `gcd`/`gcd_ext`/`lcm`, `is_multiple_of`/`remove`, in-place ops, `powi`,
+  `from_parts`, `ilog`, and `simplest_from_float` all take native int/float.
 - Broadened constructors: `FBig`/`DBig`/`RBig`/`CBig` now accept any Python number
   (int/float/`Decimal`/`Fraction`) in addition to strings.
 - A module-level `math` API (`sin`/`cos`/…/`exp`/`ln`/`sqrt`/`gcd`/`lcm`/…) and a

python/dashu.pyi

@@ -54,12 +54,12 @@ class UBig:
     def __mod__(self, other: Number) -> "UBig|IBig|FBig|DBig|RBig": ...
     def __divmod__(self, other: int | UBig | IBig) -> tuple: ...
     def __pow__(self, exp: int | UBig, modulus: Optional[int | UBig] = ...) -> UBig: ...
-    def __iadd__(self, other: UBig) -> None: ...
-    def __isub__(self, other: UBig) -> None: ...
-    def __imul__(self, other: UBig) -> None: ...
-    def __iand__(self, other: UBig) -> None: ...
-    def __ior__(self, other: UBig) -> None: ...
-    def __ixor__(self, other: UBig) -> None: ...
+    def __iadd__(self, other: int | UBig) -> None: ...
+    def __isub__(self, other: int | UBig) -> None: ...
+    def __imul__(self, other: int | UBig) -> None: ...
+    def __iand__(self, other: int | UBig) -> None: ...
+    def __ior__(self, other: int | UBig) -> None: ...
+    def __ixor__(self, other: int | UBig) -> None: ...
     def __ilshift__(self, other: int) -> None: ...
     def __irshift__(self, other: int) -> None: ...
     def __pos__(self) -> UBig: ...
@@ -85,10 +85,10 @@ class UBig:
     def sqr(self) -> UBig: ...
     def cubic(self) -> UBig: ...
     def ilog(self, base: int | UBig) -> int: ...
-    def is_multiple_of(self, divisor: UBig) -> bool: ...
-    def remove(self, factor: UBig) -> int: ...
-    def gcd(self, other: UBig) -> UBig: ...
-    def gcd_ext(self, other: UBig) -> tuple[UBig, IBig, IBig]: ...
+    def is_multiple_of(self, divisor: int | UBig) -> bool: ...
+    def remove(self, factor: int | UBig) -> int: ...
+    def gcd(self, other: int | UBig) -> UBig: ...
+    def gcd_ext(self, other: int | UBig) -> tuple[UBig, IBig, IBig]: ...
     # bit operations
     def count_ones(self) -> int: ...
     def count_zeros(self) -> Optional[int]: ...
@@ -137,12 +137,12 @@ class IBig:
     def __mod__(self, other: Number) -> "UBig|IBig|FBig|DBig|RBig": ...
     def __divmod__(self, other: int | UBig | IBig) -> tuple: ...
     def __pow__(self, exp: int | UBig, modulus: Optional[int | UBig] = ...) -> IBig: ...
-    def __iadd__(self, other: IBig) -> None: ...
-    def __isub__(self, other: IBig) -> None: ...
-    def __imul__(self, other: IBig) -> None: ...
-    def __iand__(self, other: IBig) -> None: ...
-    def __ior__(self, other: IBig) -> None: ...
-    def __ixor__(self, other: IBig) -> None: ...
+    def __iadd__(self, other: int | IBig) -> None: ...
+    def __isub__(self, other: int | IBig) -> None: ...
+    def __imul__(self, other: int | IBig) -> None: ...
+    def __iand__(self, other: int | IBig) -> None: ...
+    def __ior__(self, other: int | IBig) -> None: ...
+    def __ixor__(self, other: int | IBig) -> None: ...
     def __ilshift__(self, other: int) -> None: ...
     def __irshift__(self, other: int) -> None: ...
     def __pos__(self) -> IBig: ...
@@ -255,7 +255,7 @@ class FBig:
     def asin(self) -> FBig: ...
     def acos(self) -> FBig: ...
     def atan(self) -> FBig: ...
-    def atan2(self, x: FBig) -> FBig: ...
+    def atan2(self, x: float | int | FBig) -> FBig: ...
     def sinh(self) -> FBig: ...
     def cosh(self) -> FBig: ...
     def tanh(self) -> FBig: ...
@@ -269,7 +269,7 @@ class FBig:
     def sqrt(self) -> FBig: ...
     def cbrt(self) -> FBig: ...
     def nth_root(self, n: int) -> FBig: ...
-    def powf(self, w: FBig) -> FBig: ...
+    def powf(self, w: float | int | FBig) -> FBig: ...
     def powi(self, n: int | IBig) -> FBig: ...
 
 
@@ -327,7 +327,7 @@ class DBig:
     def asin(self) -> DBig: ...
     def acos(self) -> DBig: ...
     def atan(self) -> DBig: ...
-    def atan2(self, x: DBig) -> DBig: ...
+    def atan2(self, x: float | int | DBig) -> DBig: ...
     def sinh(self) -> DBig: ...
     def cosh(self) -> DBig: ...
     def tanh(self) -> DBig: ...
@@ -341,7 +341,7 @@ class DBig:
     def sqrt(self) -> DBig: ...
     def cbrt(self) -> DBig: ...
     def nth_root(self, n: int) -> DBig: ...
-    def powf(self, w: DBig) -> DBig: ...
+    def powf(self, w: float | int | DBig) -> DBig: ...
     def powi(self, n: int | IBig) -> DBig: ...
 
 
@@ -397,7 +397,7 @@ class RBig:
     @staticmethod
     def from_parts(numerator: int | IBig, denominator: int | UBig) -> RBig: ...
     @staticmethod
-    def simplest_from_float(f: FBig) -> Optional[RBig]: ...
+    def simplest_from_float(f: float | int | FBig) -> Optional[RBig]: ...
 
 
 class CBig:
@@ -458,31 +458,31 @@ class Cache:
 def auto(obj: Number) -> "UBig|IBig|FBig|DBig|RBig": ...
 def autos(s: str) -> "UBig|IBig|FBig|DBig|RBig": ...
 
-def sin(x: FBig) -> FBig: ...
-def cos(x: FBig) -> FBig: ...
-def tan(x: FBig) -> FBig: ...
-def asin(x: FBig) -> FBig: ...
-def acos(x: FBig) -> FBig: ...
-def atan(x: FBig) -> FBig: ...
-def atan2(y: FBig, x: FBig) -> FBig: ...
-def sinh(x: FBig) -> FBig: ...
-def cosh(x: FBig) -> FBig: ...
-def tanh(x: FBig) -> FBig: ...
-def asinh(x: FBig) -> FBig: ...
-def acosh(x: FBig) -> FBig: ...
-def atanh(x: FBig) -> FBig: ...
-def exp(x: FBig) -> FBig: ...
-def expm1(x: FBig) -> FBig: ...
-def log(x: FBig) -> FBig: ...
-def log1p(x: FBig) -> FBig: ...
-def ln(x: FBig) -> FBig: ...
-def ln_1p(x: FBig) -> FBig: ...
-def sqrt(x: FBig) -> FBig: ...
-def cbrt(x: FBig) -> FBig: ...
-def nth_root(x: FBig, n: int) -> FBig: ...
-def powf(x: FBig, y: FBig) -> FBig: ...
-def powi(x: FBig, n: int | IBig) -> FBig: ...
-def hypot(x: FBig, y: FBig) -> FBig: ...
-def gcd(a: UBig, b: UBig) -> UBig: ...
-def gcd_ext(a: UBig, b: UBig) -> tuple[UBig, IBig, IBig]: ...
-def lcm(a: UBig, b: UBig) -> UBig: ...
+def sin(x: Number) -> FBig: ...
+def cos(x: Number) -> FBig: ...
+def tan(x: Number) -> FBig: ...
+def asin(x: Number) -> FBig: ...
+def acos(x: Number) -> FBig: ...
+def atan(x: Number) -> FBig: ...
+def atan2(y: Number, x: Number) -> FBig: ...
+def sinh(x: Number) -> FBig: ...
+def cosh(x: Number) -> FBig: ...
+def tanh(x: Number) -> FBig: ...
+def asinh(x: Number) -> FBig: ...
+def acosh(x: Number) -> FBig: ...
+def atanh(x: Number) -> FBig: ...
+def exp(x: Number) -> FBig: ...
+def expm1(x: Number) -> FBig: ...
+def log(x: Number) -> FBig: ...
+def log1p(x: Number) -> FBig: ...
+def ln(x: Number) -> FBig: ...
+def ln_1p(x: Number) -> FBig: ...
+def sqrt(x: Number) -> FBig: ...
+def cbrt(x: Number) -> FBig: ...
+def nth_root(x: Number, n: int) -> FBig: ...
+def powf(x: Number, y: Number) -> FBig: ...
+def powi(x: Number, n: int | IBig) -> FBig: ...
+def hypot(x: Number, y: Number) -> FBig: ...
+def gcd(a: int | UBig, b: int | UBig) -> UBig: ...
+def gcd_ext(a: int | UBig, b: int | UBig) -> tuple[UBig, IBig, IBig]: ...
+def lcm(a: int | UBig, b: int | UBig) -> UBig: ...

python/src/convert.rs

@@ -249,7 +249,10 @@ impl<'a> UniInput<'a> {
             Self::BUint(x) => Ok(FPy(FBig::from(x.0.clone()))),
             Self::BInt(x) => Ok(FPy(FBig::from(x.0.clone()))),
             Self::OBInt(x) => Ok(FPy(FBig::from(x))),
-            Self::Float(x) => FBig::try_from(x).map(FPy).map_err(conversion_error_to_py),
+            Self::Float(x) => FBig::try_from(x)
+                .map(|f| f.with_precision(f64::MANTISSA_DIGITS as usize).value())
+                .map(FPy)
+                .map_err(conversion_error_to_py),
             Self::BFloat(x) => Ok(FPy(x.0.clone())),
             Self::BRational(x) => FBig::try_from(x.0.clone())
                 .map(FPy)

python/src/float.rs

@@ -341,7 +341,8 @@ impl FPy {
         let ctx = self.0.context();
         Ok(Self(unwrap_float(ctx.nth_root(n, self.0.repr()), ctx)?))
     }
-    fn powf(&self, w: &Self) -> PyResult<Self> {
+    fn powf(&self, w: UniInput<'_>) -> PyResult<Self> {
+        let w = w.into_fpy()?;
         let ctx = self.0.context();
         let res = with_cache(|c| ctx.powf(self.0.repr(), w.0.repr(), Some(c)));
         Ok(Self(unwrap_float(res, ctx)?))
@@ -351,7 +352,8 @@ impl FPy {
         let ctx = self.0.context();
         Ok(Self(unwrap_float(ctx.powi(self.0.repr(), n), ctx)?))
     }
-    fn atan2(&self, x: &Self) -> PyResult<Self> {
+    fn atan2(&self, x: UniInput<'_>) -> PyResult<Self> {
+        let x = x.into_fpy()?;
         let ctx = self.0.context();
         let res = with_cache(|c| ctx.atan2(self.0.repr(), x.0.repr(), Some(c)));
         Ok(Self(unwrap_float(res, ctx)?))
@@ -623,7 +625,8 @@ impl DPy {
         let ctx = self.0.context();
         Ok(Self(unwrap_float(ctx.nth_root(n, self.0.repr()), ctx)?))
     }
-    fn powf(&self, w: &Self) -> PyResult<Self> {
+    fn powf(&self, w: UniInput<'_>) -> PyResult<Self> {
+        let w = w.into_dpy()?;
         let ctx = self.0.context();
         let res = with_cache(|c| ctx.powf(self.0.repr(), w.0.repr(), Some(c)));
         Ok(Self(unwrap_float(res, ctx)?))
@@ -633,7 +636,8 @@ impl DPy {
         let ctx = self.0.context();
         Ok(Self(unwrap_float(ctx.powi(self.0.repr(), n), ctx)?))
     }
-    fn atan2(&self, x: &Self) -> PyResult<Self> {
+    fn atan2(&self, x: UniInput<'_>) -> PyResult<Self> {
+        let x = x.into_dpy()?;
         let ctx = self.0.context();
         let res = with_cache(|c| ctx.atan2(self.0.repr(), x.0.repr(), Some(c)));
         Ok(Self(unwrap_float(res, ctx)?))

python/src/int.rs

@@ -566,20 +566,20 @@ impl UPy {
         }
         Ok(self.0.ilog(&base))
     }
-    fn is_multiple_of(&self, divisor: &Self) -> bool {
-        self.0.is_multiple_of(&divisor.0)
+    fn is_multiple_of(&self, divisor: UniInput<'_>) -> PyResult<bool> {
+        Ok(self.0.is_multiple_of(&divisor.into_ubig()?))
     }
-    fn remove(&mut self, factor: &Self) -> PyResult<usize> {
+    fn remove(&mut self, factor: UniInput<'_>) -> PyResult<usize> {
         self.0
-            .remove(&factor.0)
+            .remove(&factor.into_ubig()?)
             .ok_or_else(|| PyValueError::new_err("the factor does not divide this number"))
     }
-    fn gcd(&self, other: &Self) -> Self {
-        UPy(Gcd::gcd(&self.0, &other.0))
+    fn gcd(&self, other: UniInput<'_>) -> PyResult<Self> {
+        Ok(UPy(Gcd::gcd(&self.0, &other.into_ubig()?)))
     }
-    fn gcd_ext(&self, other: &Self) -> (Self, IPy, IPy) {
-        let (g, s, t) = ExtendedGcd::gcd_ext(&self.0, &other.0);
-        (UPy(g), IPy(s), IPy(t))
+    fn gcd_ext(&self, other: UniInput<'_>) -> PyResult<(Self, IPy, IPy)> {
+        let (g, s, t) = ExtendedGcd::gcd_ext(&self.0, &other.into_ubig()?);
+        Ok((UPy(g), IPy(s), IPy(t)))
     }
 
     /********** bit operations **********/
@@ -759,28 +759,34 @@ impl UPy {
     }
 
     #[inline]
-    fn __iadd__(&mut self, other: &Self) {
-        self.0 += &other.0;
+    fn __iadd__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 += &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
-    fn __isub__(&mut self, other: &Self) {
-        self.0 -= &other.0;
+    fn __isub__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 -= &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
-    fn __imul__(&mut self, other: &Self) {
-        self.0 *= &other.0;
+    fn __imul__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 *= &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
-    fn __iand__(&mut self, other: &Self) {
-        self.0 &= &other.0;
+    fn __iand__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 &= &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
-    fn __ior__(&mut self, other: &Self) {
-        self.0 |= &other.0;
+    fn __ior__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 |= &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
-    fn __ixor__(&mut self, other: &Self) {
-        self.0 ^= &other.0;
+    fn __ixor__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 ^= &other.into_ubig()?;
+        Ok(())
     }
     #[inline]
     fn __ilshift__(&mut self, other: usize) {
@@ -1151,28 +1157,34 @@ impl IPy {
     }
 
     #[inline]
-    fn __iadd__(&mut self, other: &Self) {
-        self.0 += &other.0;
+    fn __iadd__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 += &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
-    fn __isub__(&mut self, other: &Self) {
-        self.0 -= &other.0;
+    fn __isub__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 -= &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
-    fn __imul__(&mut self, other: &Self) {
-        self.0 *= &other.0;
+    fn __imul__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 *= &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
-    fn __iand__(&mut self, other: &Self) {
-        self.0 &= &other.0;
+    fn __iand__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 &= &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
-    fn __ior__(&mut self, other: &Self) {
-        self.0 |= &other.0;
+    fn __ior__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 |= &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
-    fn __ixor__(&mut self, other: &Self) {
-        self.0 ^= &other.0;
+    fn __ixor__(&mut self, other: UniInput<'_>) -> PyResult<()> {
+        self.0 ^= &other.into_ibig()?;
+        Ok(())
     }
     #[inline]
     fn __ilshift__(&mut self, other: usize) {

python/src/lib.rs

@@ -10,7 +10,7 @@ mod convert;
 mod float;
 mod int;
 mod math;
-mod ratio;
+mod rational;
 mod types;
 mod utils;
 mod words;