Add Valuable conversion to rational

ohhmm · Jan 27, 2024 · db48cba · db48cba
1 parent 053399d
commit db48cba
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 deletions.
diff --git a/omnn/math/Fraction.cpp b/omnn/math/Fraction.cpp
@@ -519,6 +519,11 @@ std::pair<bool,Valuable> Fraction::IsSummationSimplifiable(const Valuable& v) co
         return static_cast<double>(numerator()) / static_cast<double>(denominator());
     }
 
+    Fraction::operator a_rational() const
+    {
+        return static_cast<a_rational>(numerator()) / static_cast<a_rational>(denominator());
+    }
+
     Valuable& Fraction::sq(){
         numerator().sq();
         denominator().sq();

diff --git a/omnn/math/Fraction.h b/omnn/math/Fraction.h
@@ -99,6 +99,7 @@ namespace math {
 
         explicit operator unsigned char() const override;
         explicit operator a_int() const override;
+        explicit operator a_rational() const override;
         operator boost::multiprecision::cpp_dec_float_100() const;
         Valuable operator()(const Variable&, const Valuable& augmentation) const override;
         static max_exp_t getMaxVaExp(const Valuable& _1, const Valuable& _2) {

diff --git a/omnn/math/Integer.cpp b/omnn/math/Integer.cpp
@@ -269,6 +269,11 @@ namespace math {
         return boost::numeric_cast<long double>(arbitrary);
     }
 
+    Integer::operator a_rational() const
+    {
+        return boost::numeric_cast<a_rational>(arbitrary);
+    }
+
     Integer::operator unsigned char() const
     {
         return boost::numeric_cast<unsigned char>(arbitrary);

diff --git a/omnn/math/Integer.h b/omnn/math/Integer.h
@@ -135,6 +135,7 @@ class Integer
     explicit operator uint64_t() const override;
     explicit operator double() const override;
     explicit operator long double() const override;
+    explicit operator a_rational() const override;
     explicit operator uint32_t() const override;
     explicit operator unsigned char() const override;
     a_int& a() override;

diff --git a/omnn/math/Product.cpp b/omnn/math/Product.cpp
@@ -123,10 +123,10 @@ namespace math {
         if (!e.IsInt()) {
             IMPLEMENT
         }
-        auto wasMax = maxVaExp == max_exp_t(e.ca(), 1);
+        auto wasMax = maxVaExp == static_cast<decltype(maxVaExp)>(e);
         e += exponentiation;
 
-        auto isMax = maxVaExp < e.ca();
+        auto isMax = maxVaExp < static_cast<decltype(maxVaExp)>(e);
         if (isMax) {
             maxVaExp = e.ca();
         }

diff --git a/omnn/math/Valuable.cpp b/omnn/math/Valuable.cpp
@@ -2173,6 +2173,14 @@ bool Valuable::SerializedStrEqual(const std::string_view& s) const {
             IMPLEMENT
     }
 
+    Valuable::operator a_rational() const
+    {
+        if (exp)
+            return exp->operator a_rational();
+        else
+            IMPLEMENT
+    }
+
     Valuable::operator uint32_t() const
     {
         if (exp)

diff --git a/omnn/math/Valuable.h b/omnn/math/Valuable.h
@@ -447,6 +447,7 @@ class Valuable
     virtual explicit operator uint64_t() const;
     virtual explicit operator double() const;
     virtual explicit operator long double() const;
+    virtual explicit operator a_rational() const;
     virtual explicit operator uint32_t() const;
     virtual explicit operator unsigned char() const;
     virtual a_int& a();