merge from fmf-devel branch. more updates to models: now with collectModelInfo with...
authorAndrew Reynolds <andrew.j.reynolds@gmail.com>
Fri, 31 Aug 2012 16:48:20 +0000 (16:48 +0000)
committerAndrew Reynolds <andrew.j.reynolds@gmail.com>
Fri, 31 Aug 2012 16:48:20 +0000 (16:48 +0000)
commit3c4935c7c0c6774588af94c82307a960e58a1154
treee518c60ec182e91300fe53293c42cd4b85e49d29
parentec9e426df607f13e5a0c0f52fbc6ed5dbb79fdf9
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
106 files changed:
src/expr/command.cpp
src/expr/command.h
src/parser/cvc/Cvc.g
src/parser/smt2/Smt2.g
src/printer/ast/ast_printer.cpp
src/printer/ast/ast_printer.h
src/printer/cvc/cvc_printer.cpp
src/printer/cvc/cvc_printer.h
src/printer/dagification_visitor.cpp
src/printer/printer.cpp
src/printer/printer.h
src/printer/smt/smt_printer.cpp
src/printer/smt/smt_printer.h
src/printer/smt2/smt2_printer.cpp
src/printer/smt2/smt2_printer.h
src/prop/minisat/core/Solver.cc
src/prop/options
src/smt/Makefile.am
src/smt/model_format_mode.cpp [new file with mode: 0644]
src/smt/model_format_mode.h [new file with mode: 0644]
src/smt/options
src/smt/options_handlers.h
src/smt/smt_engine.cpp
src/smt/smt_engine.h
src/theory/Makefile.am
src/theory/arith/theory_arith.cpp
src/theory/arith/theory_arith.h
src/theory/arith/theory_arith_instantiator.cpp
src/theory/arith/theory_arith_instantiator.h
src/theory/arrays/theory_arrays.cpp
src/theory/arrays/theory_arrays.h
src/theory/arrays/theory_arrays_model.cpp
src/theory/arrays/theory_arrays_model.h
src/theory/booleans/theory_bool.cpp
src/theory/booleans/theory_bool.h
src/theory/builtin/theory_builtin.cpp
src/theory/builtin/theory_builtin.h
src/theory/bv/theory_bv.cpp
src/theory/bv/theory_bv.h
src/theory/datatypes/kinds
src/theory/datatypes/options
src/theory/datatypes/theory_datatypes.cpp
src/theory/datatypes/theory_datatypes.h
src/theory/datatypes/theory_datatypes_instantiator.cpp
src/theory/example/theory_uf_tim.h
src/theory/model.cpp
src/theory/model.h
src/theory/output_channel.h
src/theory/quantifiers/Makefile.am
src/theory/quantifiers/first_order_model.cpp
src/theory/quantifiers/first_order_model.h
src/theory/quantifiers/inst_match.cpp
src/theory/quantifiers/inst_when_mode.cpp [deleted file]
src/theory/quantifiers/inst_when_mode.h [deleted file]
src/theory/quantifiers/instantiation_engine.cpp
src/theory/quantifiers/instantiation_engine.h
src/theory/quantifiers/kinds
src/theory/quantifiers/literal_match_mode.cpp [deleted file]
src/theory/quantifiers/literal_match_mode.h [deleted file]
src/theory/quantifiers/model_builder.cpp
src/theory/quantifiers/model_builder.h
src/theory/quantifiers/model_engine.cpp
src/theory/quantifiers/model_engine.h
src/theory/quantifiers/modes.cpp [new file with mode: 0644]
src/theory/quantifiers/modes.h [new file with mode: 0644]
src/theory/quantifiers/options
src/theory/quantifiers/options_handlers.h
src/theory/quantifiers/quantifiers_attributes.cpp [new file with mode: 0644]
src/theory/quantifiers/quantifiers_attributes.h [new file with mode: 0644]
src/theory/quantifiers/relevant_domain.cpp
src/theory/quantifiers/relevant_domain.h
src/theory/quantifiers/rep_set_iterator.cpp [deleted file]
src/theory/quantifiers/rep_set_iterator.h [deleted file]
src/theory/quantifiers/term_database.cpp
src/theory/quantifiers/theory_quantifiers.cpp
src/theory/quantifiers/theory_quantifiers.h
src/theory/quantifiers_engine.cpp
src/theory/quantifiers_engine.h
src/theory/rep_set.cpp [new file with mode: 0644]
src/theory/rep_set.h [new file with mode: 0644]
src/theory/rewriterules/theory_rewriterules.cpp
src/theory/rewriterules/theory_rewriterules.h
src/theory/shared_terms_database.cpp
src/theory/shared_terms_database.h
src/theory/term_registration_visitor.cpp
src/theory/theory.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/theory/theory_test_utils.h
src/theory/uf/equality_engine.h
src/theory/uf/kinds
src/theory/uf/options
src/theory/uf/theory_uf.cpp
src/theory/uf/theory_uf.h
src/theory/uf/theory_uf_model.cpp
src/theory/uf/theory_uf_model.h
src/theory/uf/theory_uf_strong_solver.cpp
src/theory/uf/theory_uf_strong_solver.h
src/theory/uf/theory_uf_type_rules.h
src/theory/valuation.cpp
src/theory/valuation.h
src/util/datatype.cpp
src/util/datatype.h
src/util/model.h
test/regress/regress0/quantifiers/refcount24.cvc [new file with mode: 0644]
test/unit/theory/theory_engine_white.h