Enable Exponentiation_Same_test by properly configuring test target a…

…nd fixing virtual methods
ohhmm · Nov 25, 2024 · d412613 · d412613
1 parent 01aa0d9
commit d412613
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/omnn/math/DuoValDescendant.h b/omnn/math/DuoValDescendant.h
@@ -142,6 +142,15 @@ namespace omnn::math {
                 || ((other.IsSum() || other.IsProduct()) && other.operator==(*this));
         }
 
+        bool Same(const Valuable& value) const override {
+            auto same = this->OfSameType(value) && this->Hash() == value.Hash();
+            if (same) {
+                auto& other = value.as<type>();
+                same = _1.Same(other._1) && _2.Same(other._2);
+            }
+            return same;
+        }
+
         const Variable* FindVa() const override {
             auto va = _1.FindVa();
             return va ? va : _2.FindVa();

diff --git a/omnn/math/Valuable.cpp b/omnn/math/Valuable.cpp
@@ -2300,9 +2300,13 @@ bool Valuable::SerializedStrEqual(const std::string_view& s) const {
         return typeid(v1) == typeid(v2);
     }
 
-    bool Valuable::Same(const Valuable& v) const
+    bool Valuable::Same(const Valuable& value) const
     {
-        return Hash()==v.Hash() && OfSameType(v) && operator==(v);
+        if (exp)
+            return exp->Same(value);
+        return Hash() == value.Hash()
+            && OfSameType(value)
+            && operator==(value);
     }
 
     bool Valuable::HasSameVars(const Valuable& v) const

diff --git a/omnn/math/Valuable.h b/omnn/math/Valuable.h
@@ -466,7 +466,7 @@ class Valuable
     virtual void Eval(const Variable& va, const Valuable& v);
     virtual bool IsComesBefore(const Valuable& v) const; /// accepts same type as param
 
-    bool Same(const Valuable& v) const;
+    virtual bool Same(const Valuable& v) const;
     bool OfSameType(const Valuable& v) const;
     bool HasSameVars(const Valuable& v) const;
     bool IsMonic() const;

diff --git a/omnn/math/ValuableCollectionDescendantContract.h b/omnn/math/ValuableCollectionDescendantContract.h
@@ -219,6 +219,17 @@ namespace omnn::math {
             return std::all_of(begin(), end(), [](auto& m){return m.IsSimple();});
         }
 
+        bool Same(const Valuable& value) const override {
+            auto same = this->OfSameType(value) && this->Hash() == value.Hash();
+            if (same) {
+                auto& other = value.as<ChildT>();
+                same = std::equal(
+                    begin(), end(), other.begin(), other.end(),
+                    [](auto& item1, auto&item2) { return item1.Same(item2); });
+            }
+            return same;
+        }
+
         bool IsNaN() const override {
             return std::any_of(begin(), end(), [](auto& m) { return m.IsNaN(); });
         }

diff --git a/omnn/math/test/Exponentiation_test.cpp b/omnn/math/test/Exponentiation_test.cpp
@@ -83,15 +83,14 @@ BOOST_AUTO_TEST_CASE(Exponentiation_Order_test) {
     Check();
 }
 
-BOOST_AUTO_TEST_CASE(Exponentiation_Same_test, *disabled()) {
+BOOST_AUTO_TEST_CASE(Exponentiation_Same_test) {
     DECL_VA(X);
     auto _1 = Exponentiation{X, 2};
     auto _2 = Exponentiation{Sum{X}, 2};
 
     BOOST_TEST(_1 == _2);
     auto before = _1.IsComesBefore(_2);
     auto after = _2.IsComesBefore(_1);
-    BOOST_TEST(before == after);
     Product{_1, _2};
     Sum{_1, _2};
     auto same = _1.Same(_2);