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

1 files changed, 43 insertions, 0 deletions

diff --git a/src/theory/quantifiers/quantifiers_attributes.cpp b/src/theory/quantifiers/quantifiers_attributes.cpp
new file mode 100644
index 000000000..22ee66362
--- /dev/null
+++ b/src/theory/quantifiers/quantifiers_attributes.cpp
@@ -0,0 +1,43 @@
+/*********************                                                        */

+/*! \file quantifiers_attributes.cpp

+ ** \verbatim

+ ** Original author: ajreynol

+ ** Major contributors: none

+ ** Minor contributors (to current version): none

+ ** This file is part of the CVC4 prototype.

+ ** Copyright (c) 2009-2012  The Analysis of Computer Systems Group (ACSys)

+ ** Courant Institute of Mathematical Sciences

+ ** New York University

+ ** See the file COPYING in the top-level source directory for licensing

+ ** information.\endverbatim

+ **

+ ** \brief Implementation of QuantifiersAttributes class

+ **/

+

+#include "theory/quantifiers/quantifiers_attributes.h"

+#include "theory/quantifiers/options.h"

+

+using namespace std;

+using namespace CVC4;

+using namespace CVC4::kind;

+using namespace CVC4::context;

+using namespace CVC4::theory;

+using namespace CVC4::theory::quantifiers;

+

+void QuantifiersAttributes::setUserAttribute( std::string& attr, Node n ){

+  if( n.getKind()==FORALL ){

+    if( attr=="axiom" ){

+      Trace("quant-attr") << "Set axiom " << n << std::endl;

+      AxiomAttribute aa;

+      n.setAttribute( aa, true );

+    }else if( attr=="conjecture" ){

+      Trace("quant-attr") << "Set conjecture " << n << std::endl;

+      ConjectureAttribute ca;

+      n.setAttribute( ca, true );

+    }

+  }else{

+    for( size_t i=0; i<n.getNumChildren(); i++ ){

+      setUserAttribute( attr, n[i] );

+    }

+  }

+}