Integer::LCM

ohhmm · Feb 3, 2024 · 1bafafb · 1bafafb
1 parent 24e5383
commit 1bafafb
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/omnn/math/Integer.cpp b/omnn/math/Integer.cpp
@@ -607,6 +607,21 @@ namespace math {
             : v.GCD(*this);
     }
 
+    Valuable Integer::LCM(const Valuable& v) const {
+        return v.IsInt() ? boost::lcm(v.ca(), ca()) : v.LCM(*this);
+    }
+
+    Valuable& Integer::lcm(const Valuable& v) {
+        if (v.IsInt()) {
+            arbitrary = boost::lcm(v.ca(), ca());
+            hash = std::hash<base_int>()(arbitrary);
+        } else {
+            Become(v.LCM(*this));
+        }
+        return *this;
+    }
+
+
     // sqrt using boost
     Valuable Integer::Sqrt() const
     {

diff --git a/omnn/math/Integer.h b/omnn/math/Integer.h
@@ -171,6 +171,8 @@ class Integer
     bool IsComesBefore(const Valuable& v) const override;
     Valuable InCommonWith(const Valuable& v) const override;
     Valuable GCD(const Valuable& v) const override;
+    Valuable LCM(const Valuable& v) const override;
+    Valuable& lcm(const Valuable& v) override;
 
     std::wstring save(const std::wstring&) const override;
     std::ostream& code(std::ostream&) const override;

diff --git a/omnn/math/Valuable.cpp b/omnn/math/Valuable.cpp
@@ -1317,8 +1317,35 @@ bool Valuable::SerializedStrEqual(const std::string_view& s) const {
         return Become(GCD(v));
     }
 
+    Valuable Valuable::LCM(const Valuable& v) const {
+        if (exp) {
+            return exp->LCM(v);
+        } else {
+            IMPLEMENT
+        }
+    }
+
     Valuable& Valuable::lcm(const Valuable& v) {
-        IMPLEMENT
+        if (exp) {
+            Valuable& o = exp->lcm(v);
+            if (o.exp) {
+                exp = o.exp;
+            }
+            return *this;
+        }
+		//else
+		//	IMPLEMENT
+        if (operator==(constants::zero))
+            return *this;
+        else if (v == constants::zero)
+			return *this;
+        else if (operator==(v)) {
+            Become(0);
+            return *this;
+        } else {
+            auto gcd = GCD(v);
+            return operator*=(v).abs().operator/=(gcd);
+        }
     }
 
     Valuable& Valuable::d(const Variable& x)

diff --git a/omnn/math/Valuable.h b/omnn/math/Valuable.h
@@ -291,8 +291,9 @@ class Valuable
 
     // returns the greatest common divisor (GCD) with the given object
     virtual Valuable GCD(const Valuable& v) const;
-    Valuable& gcd(const Valuable& v);
-    Valuable& lcm(const Valuable& v);
+    virtual Valuable& gcd(const Valuable& v);
+    virtual Valuable LCM(const Valuable& v) const;
+    virtual Valuable& lcm(const Valuable& v);
 
     virtual Valuable& d(const Variable& x);
     struct IntegrationParams {