diff options
author | Tim King <taking@cs.nyu.edu> | 2012-04-17 16:07:22 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-04-17 16:07:22 +0000 |
commit | ccd77233892ace44fd4852999e66534d1c2283ea (patch) | |
tree | a856cacd24508a5839fcdbe728583ff055b64e34 /test/regress/regress0/arith/integers | |
parent | 9644b6e12fbd3b649daafa43c5400d272e27bfb4 (diff) |
Merges branches/arithmetic/atom-database r2979 through 3247 into trunk. Below is a highlight of the changes:
- This introduces a new normal form to arithmetic.
-- Equalities and disequalities are in solved form.
Roughly speaking this means: (= x (+ y z)) is in normal form.
(See the comments in normal_form.h for what this formally requires.)
-- The normal form for inequality atoms always uses GEQ and GT instead of GEQ and LEQ.
Integer atoms always use GEQ.
- Constraint was added to TheoryArith.
-- A constraint is a triple of (k x v) where:
--- k is the type of the constraint (either LowerBound, UpperBound, Equality or Disequality),
--- x is an ArithVar, and
--- v is a DeltaRational value.
-- Constraints are always attached to a ConstraintDatabase.
-- A Constraint has its negation in the ConstraintDatabase [at least for now].
-- Every constraint belongs to a set of constraints for each ArithVar sorted by the delta rational values.
-- This set can be iterated over and provides efficient access to other constraints for this variable.
-- A literal may be attached to a constraint.
-- Constraints with attached literals may be marked as being asserted to the theory (sat context dependent).
-- Constraints can be propagated.
-- Every constraint has a proof (sat context dependent).
-- Proofs can be explained for either conflicts or propagations (if the node was propagated). (These proofs may be different.)
-- Equalities and disequalities can be marked as being split (user context dependent)
- This removes and replaces:
-- src/theory/arith/arith_prop_manager.*
-- src/theory/arith/atom_database.*
-- src/theory/arith/ordered_set.h
- Added isZero(), isOne() and isNegativeOne() to Rational and Integer.
- Added operator+ to CDList::const_iterator.
- Added const_iterator to CDQueue.
- Changes to regression tests.
Diffstat (limited to 'test/regress/regress0/arith/integers')
-rw-r--r-- | test/regress/regress0/arith/integers/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/regress/regress0/arith/integers/Makefile.am b/test/regress/regress0/arith/integers/Makefile.am index eb3a9dba5..ef0ac53c3 100644 --- a/test/regress/regress0/arith/integers/Makefile.am +++ b/test/regress/regress0/arith/integers/Makefile.am @@ -11,11 +11,12 @@ MAKEFLAGS = -k # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" + TESTS = \ arith-int-004.cvc \ arith-int-007.cvc \ + arith-int-011.cvc \ arith-int-012.cvc \ - arith-int-013.cvc \ arith-int-022.cvc \ arith-int-024.cvc \ arith-int-042.cvc \ @@ -27,9 +28,6 @@ TESTS = \ arith-int-085.cvc \ arith-int-097.cvc -#failing tests -# arith-int-048.cvc - EXTRA_DIST = $(TESTS) \ arith-int-001.cvc \ arith-int-002.cvc \ @@ -39,7 +37,6 @@ EXTRA_DIST = $(TESTS) \ arith-int-008.cvc \ arith-int-009.cvc \ arith-int-010.cvc \ - arith-int-011.cvc \ arith-int-014.cvc \ arith-int-015.cvc \ arith-int-016.cvc \ @@ -118,6 +115,10 @@ EXTRA_DIST = $(TESTS) \ arith-int-099.cvc \ arith-int-100.cvc +FAILING_TESTS = \ + arith-int-048.cvc \ + arith-int-013.cvc + #if CVC4_BUILD_PROFILE_COMPETITION #else #TESTS += \ |