From: Andrew Reynolds <andrew.j.reynolds@gmail.com>
Date: Wed, 12 Aug 2020 14:18:24 +0000 (-0500)
Subject: Fix connection to master equality engine in sets (#4877)
X-Git-Tag: cvc5-1.0.0~3019
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5a7dc772788ea3f1d568da0d8ef4effca080b9c;p=cvc5.git

Fix connection to master equality engine in sets (#4877)

This corrects an issue introduced by a merge of a previous commit (b5b2858) which dropped the connection from sets to its master equality engine.

Fixes several issues in sets regressions, including a timeout in regress0.
---

diff --git a/src/theory/sets/theory_sets.cpp b/src/theory/sets/theory_sets.cpp
index 17caac4f7..021db5bd3 100644
--- a/src/theory/sets/theory_sets.cpp
+++ b/src/theory/sets/theory_sets.cpp
@@ -203,6 +203,11 @@ eq::EqualityEngine* TheorySets::getEqualityEngine()
   return &d_equalityEngine;
 }
 
+void TheorySets::setMasterEqualityEngine(eq::EqualityEngine* eq)
+{
+  d_equalityEngine.setMasterEqualityEngine(eq);
+}
+
 /**************************** eq::NotifyClass *****************************/
 
 bool TheorySets::NotifyClass::eqNotifyTriggerEquality(TNode equality,
diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h
index f1b59e419..505ba9547 100644
--- a/src/theory/sets/theory_sets.h
+++ b/src/theory/sets/theory_sets.h
@@ -65,6 +65,7 @@ class TheorySets : public Theory
   PPAssertStatus ppAssert(TNode in, SubstitutionMap& outSubstitutions) override;
   void presolve() override;
   void propagate(Effort) override;
+  void setMasterEqualityEngine(eq::EqualityEngine* eq) override;
   bool isEntailed(Node n, bool pol);
   /* equality engine */
   virtual eq::EqualityEngine* getEqualityEngine() override;