From 3c4935c7c0c6774588af94c82307a960e58a1154 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Fri, 31 Aug 2012 16:48:20 +0000 Subject: merge from fmf-devel branch. more updates to models: now with collectModelInfo with fullModel argument, most theory-specific implementation out of the model class, model printer relegated to printer classes. Also updates to finite mode finding, modifications to datatypes making them compatible with theory combination, support for theory-specific handling of user attributes, refactoring of uf models --- src/theory/uf/theory_uf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/theory/uf/theory_uf.h') diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h index 604b1f44c..62ca640aa 100644 --- a/src/theory/uf/theory_uf.h +++ b/src/theory/uf/theory_uf.h @@ -193,7 +193,7 @@ public: void preRegisterTerm(TNode term); Node explain(TNode n); - void collectModelInfo( TheoryModel* m ); + void collectModelInfo( TheoryModel* m, bool fullModel ); void ppStaticLearn(TNode in, NodeBuilder<>& learned); void presolve(); @@ -202,6 +202,7 @@ public: void computeCareGraph(); void propagate(Effort effort); + Node getNextDecisionRequest(); EqualityStatus getEqualityStatus(TNode a, TNode b); @@ -226,7 +227,6 @@ public: void registerPpRewrite(TNode op, PpRewrite* callback) { d_registeredPpRewrites.insert(std::make_pair(op, callback)); } - };/* class TheoryUF */ }/* CVC4::theory::uf namespace */ -- cgit v1.2.3