merged fmf-devel branch, includes support for SMT2 command get-value and (extended) SMT command get-model. added collectModelInfo and removed getValue from theory interface. merge also includes major updates to finite model finding module (from CASC), added fmf options, some updates to strong solver and quantifiers engine interface. The test recursion_breaker_black currently fails for me on production builds, Morgan is planning to look into this.

1 files changed, 165 insertions, 0 deletions

diff --git a/src/theory/model.h b/src/theory/model.h
new file mode 100644
index 000000000..4d6035ae5
--- /dev/null
+++ b/src/theory/model.h
@@ -0,0 +1,165 @@
+/*********************                                                        */

+/*! \file model.h

+ ** \verbatim

+ ** Original author: ajreynol

+ ** Major contributors: none

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

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

+ ** Copyright (c) 2009, 2010, 2011  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 Model class

+ **/

+

+#include "cvc4_private.h"

+

+#ifndef __CVC4__THEORY_MODEL_H

+#define __CVC4__THEORY_MODEL_H

+

+#include "util/model.h"

+#include "theory/uf/equality_engine.h"

+

+namespace CVC4 {

+namespace theory {

+

+class QuantifiersEngine;

+

+/** this class stores a representative set */

+class RepSet {

+public:

+  RepSet(){}

+  ~RepSet(){}

+  std::map< TypeNode, std::vector< Node > > d_type_reps;

+  std::map< Node, int > d_tmap;

+  /** clear the set */

+  void clear();

+  /** has type */

+  bool hasType( TypeNode tn ) { return d_type_reps.find( tn )!=d_type_reps.end(); }

+  /** add representative for type */

+  void add( Node n );

+  /** set the representatives for type */

+  void set( TypeNode t, std::vector< Node >& reps );

+  /** returns index in d_type_reps for node n */

+  int getIndexFor( Node n ) { return d_tmap.find( n )!=d_tmap.end() ? d_tmap[n] : -1; }

+  /** debug print */

+  void toStream(std::ostream& out);

+};

+

+//representative domain

+typedef std::vector< int > RepDomain;

+

+class TheoryEngineModelBuilder;

+

+/** Theory Model class

+ *    For Model m, should call m.initialize() before using

+ */

+class TheoryModel : public Model

+{

+  friend class TheoryEngineModelBuilder;

+protected:

+  /** add term */

+  virtual void addTerm( Node n ) {}

+private:

+  /** definitions */

+  std::vector< Node > d_define_funcs;

+  std::vector< TypeNode > d_define_types;

+  std::vector< int > d_defines;

+protected:

+  /** to stream functions */

+  virtual void toStreamFunction( Node n, std::ostream& out );

+  virtual void toStreamType( TypeNode tn, std::ostream& out );

+public:

+  TheoryModel( context::Context* c, std::string name );

+  virtual ~TheoryModel(){}

+  /** equality engine containing all known equalities/disequalities */

+  eq::EqualityEngine d_equalityEngine;

+  /** map of representatives of equality engine to used representatives in representative set */

+  std::map< Node, Node > d_reps;

+  /** representative alphabet */

+  RepSet d_ra;

+  //true/false nodes

+  Node d_true;

+  Node d_false;

+public:

+  /** add defined function */

+  void addDefineFunction( Node n );

+  /** add defined type */

+  void addDefineType( TypeNode tn );

+  /**

+   * Get value function.  This should be called only after a ModelBuilder has called buildModel(...)

+   * on this model.

+   */

+  Node getValue( TNode n );

+  /** get interpreted value, should be a representative in d_reps */

+  virtual Node getInterpretedValue( TNode n ) = 0;

+  /** get existing domain value, with possible exclusions */

+  Node getDomainValue( TypeNode tn, std::vector< Node >& exclude );

+  /** get new domain value */

+  Node getNewDomainValue( TypeNode tn, bool mkConst = false );

+public:

+  /** assert equality */

+  void assertEquality( Node a, Node b, bool polarity );

+  /** assert predicate */

+  void assertPredicate( Node a, bool polarity );

+  /** assert equality engine */

+  void assertEqualityEngine( eq::EqualityEngine* ee );

+public:

+  //queries about equality

+  bool hasTerm( Node a );

+  Node getRepresentative( Node a );

+  bool areEqual( Node a, Node b );

+  bool areDisequal( Node a, Node b );

+public:

+  /** print representative function */

+  void printRepresentativeDebug( const char* c, Node r );

+  void printRepresentative( std::ostream& out, Node r );

+  /** to stream function */

+  void toStream( std::ostream& out );

+};

+

+//default model class: extends model arbitrarily

+class DefaultModel : public TheoryModel

+{

+public:

+  DefaultModel( context::Context* c, std::string name );

+  virtual ~DefaultModel(){}

+public:

+  Node getInterpretedValue( TNode n );

+};

+

+//incomplete model class: does not extend model

+class IncompleteModel : public TheoryModel

+{

+public:

+  IncompleteModel( context::Context* c, std::string name ) : TheoryModel( c, name ){}

+  virtual ~IncompleteModel(){}

+public:

+  Node getInterpretedValue( TNode n ) { return Node::null(); }

+};

+

+

+class TheoryEngineModelBuilder : public ModelBuilder

+{

+protected:

+  /** pointer to theory engine */

+  TheoryEngine* d_te;

+  /** choose representative */

+  virtual Node chooseRepresentative( TheoryModel* tm, Node eqc );

+  /** representatives that are current not set */

+  virtual void processBuildModel( TheoryModel* tm );

+public:

+  TheoryEngineModelBuilder( TheoryEngine* te );

+  virtual ~TheoryEngineModelBuilder(){}

+  /**

+   *  Build model function.

+   */

+  void buildModel( Model* m );

+};

+

+}

+}

+

+#endif
\ No newline at end of file