New implementation of sets+cardinality. Merge Paul Meng's relation solver as extensi...
authorajreynol <andrew.j.reynolds@gmail.com>
Wed, 26 Oct 2016 21:23:58 +0000 (16:23 -0500)
committerajreynol <andrew.j.reynolds@gmail.com>
Wed, 26 Oct 2016 21:23:58 +0000 (16:23 -0500)
commit031722bee8682005bd4c8700ef78b5f893fc48fe
tree46a936a1bd20ea2cc588df0d3205cf7eb0fd4177
parente79e64329ce7d6df0003cab28dadb9b8bcc6f9ca
New implementation of sets+cardinality.  Merge Paul Meng's relation solver as extension of sets solver, add regressions.
106 files changed:
src/Makefile.am
src/options/sets_options
src/parser/cvc/Cvc.g
src/printer/cvc/cvc_printer.cpp
src/smt/smt_engine.cpp
src/theory/sets/card_unused_implementation.cpp [deleted file]
src/theory/sets/expr_patterns.h [deleted file]
src/theory/sets/kinds
src/theory/sets/normal_form.h
src/theory/sets/rels_utils.h [new file with mode: 0644]
src/theory/sets/scrutinize.h [deleted file]
src/theory/sets/term_info.h [deleted file]
src/theory/sets/theory_sets.cpp
src/theory/sets/theory_sets.h
src/theory/sets/theory_sets_private.cpp
src/theory/sets/theory_sets_private.h
src/theory/sets/theory_sets_rels.cpp [new file with mode: 0644]
src/theory/sets/theory_sets_rels.h [new file with mode: 0644]
src/theory/sets/theory_sets_rewriter.cpp
src/theory/sets/theory_sets_rewriter.h
src/theory/sets/theory_sets_type_rules.h
test/Makefile.am
test/regress/regress0/Makefile.am
test/regress/regress0/rels/Makefile [new file with mode: 0644]
test/regress/regress0/rels/Makefile.am [new file with mode: 0644]
test/regress/regress0/rels/addr_book_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/addr_book_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/addr_book_1_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv1-unit.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv1-unitb.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv1.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv1p-sat.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv1p.cvc [new file with mode: 0644]
test/regress/regress0/rels/bv2.cvc [new file with mode: 0644]
test/regress/regress0/rels/garbage_collect.cvc [new file with mode: 0644]
test/regress/regress0/rels/join-eq-structure-and.cvc [new file with mode: 0644]
test/regress/regress0/rels/join-eq-structure.cvc [new file with mode: 0644]
test/regress/regress0/rels/join-eq-structure_0_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/join-eq-u-sat.cvc [new file with mode: 0644]
test/regress/regress0/rels/join-eq-u.cvc [new file with mode: 0644]
test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/prod-mod-eq.cvc [new file with mode: 0644]
test/regress/regress0/rels/prod-mod-eq2.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_1tup_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_complex_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_complex_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_complex_3.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_complex_4.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_complex_5.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_conflict_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_0_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_1_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_2.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_2_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_3.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_3_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_4.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_5.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_6.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_join_7.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_mix_0_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_pressure_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_product_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_product_0_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_product_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_product_1_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_symbolic_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_symbolic_1_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_symbolic_2_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_symbolic_3_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_10_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_11.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_2_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_3.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_3_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_4.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_4_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_5_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_6.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_7.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_8.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tc_9_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_2.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_3_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_2.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_2_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_3.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_eq_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_int_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_pro_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_tp_join_var_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_0.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_1_1.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_3.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_4.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_5.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_6.cvc [new file with mode: 0644]
test/regress/regress0/rels/rel_transpose_7.cvc [new file with mode: 0644]
test/regress/regress0/rels/set-strat.cvc [new file with mode: 0644]
test/regress/regress0/rels/strat.cvc [new file with mode: 0644]
test/regress/regress0/rels/strat_0_1.cvc [new file with mode: 0644]