diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
commit | 129dadba47447148096acd216d61f93e14539cb4 (patch) | |
tree | fd0053624ee96ee84eb35d1542d1977e40830750 /examples | |
parent | 4c87c0794b7e954afd090cfbf441caa0b09c3ef5 (diff) |
Bug-related:
* ITE removal fixed to be context-dependent (on UserContext).
Resolves incrementality bugs 376 and 396 (which had given wrong answers).
* some bugfixes for incrementality that Dejan found (fixes bug 394)
* fix for bug in SmtEngine::getValue() where definitions weren't respected
(partially resolves bug 411, but get-model is still broken).
* change status of microwave21.ec.minimized.smt2 (it's actually unsat, but
was labeled sat); re-enable it for "make regress"
Also:
* --check-model doesn't fail if quantified assertions don't simplify away.
* fix some examples, and the Java system test, for the disappearance of the
BoolExpr class
* add copy constructor to array type enumerator (the type enumerator
framework requires copy ctors, and the automatically-generated copy ctor
was copying pointers that were then deleted, leaving dangling pointers in
the copy and causing segfaults)
* --dump=assertions now implies --dump=skolems
* --dump=assertions:pre-<PASS> and --dump=assertions:post-<PASS> now allow
you to dump before/after a particular preprocessing pass. E.g.,
--dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning.
"--dump=assertions" by itself is after all preprocessing, just before CNF
conversion.
* minor fixes to dumping output
* include Model in language bindings
Minor refactoring/misc:
* fix compiler warning in src/theory/model.cpp
* remove unnecessary SmtEngine::printModel().
* mkoptions script doesn't give progress output if stdout isn't a terminal
(e.g., if it's written to a log, or piped through less(1), or whatever).
* add some type enumerator unit tests
* de-emphasize --parse-only and --preprocess-only (they aren't really "common"
options)
* fix some exception throw() specifications in SmtEngine
* minor documentation clarifications
Diffstat (limited to 'examples')
-rw-r--r-- | examples/SimpleVC.java | 6 | ||||
-rw-r--r-- | examples/SimpleVC.ml | 6 | ||||
-rwxr-xr-x | examples/SimpleVC.php | 2 | ||||
-rwxr-xr-x | examples/SimpleVC.pl | 2 | ||||
-rwxr-xr-x | examples/SimpleVC.py | 4 | ||||
-rwxr-xr-x | examples/SimpleVC.rb | 2 | ||||
-rwxr-xr-x | examples/SimpleVC.tcl | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/examples/SimpleVC.java b/examples/SimpleVC.java index 41c4542fd..4f4d19f24 100644 --- a/examples/SimpleVC.java +++ b/examples/SimpleVC.java @@ -61,9 +61,9 @@ public class SimpleVC { Expr three = em.mkConst(new Rational(3)); Expr twox_plus_y_geq_3 = em.mkExpr(Kind.GEQ, twox_plus_y, three); - BoolExpr formula = - new BoolExpr(em.mkExpr(Kind.AND, x_positive, y_positive)). - impExpr(new BoolExpr(twox_plus_y_geq_3)); + Expr formula = + new Expr(em.mkExpr(Kind.AND, x_positive, y_positive)). + impExpr(new Expr(twox_plus_y_geq_3)); System.out.println("Checking validity of formula " + formula + " with CVC4."); System.out.println("CVC4 should report VALID."); diff --git a/examples/SimpleVC.ml b/examples/SimpleVC.ml index dc75752db..c89341dc8 100644 --- a/examples/SimpleVC.ml +++ b/examples/SimpleVC.ml @@ -72,12 +72,12 @@ let twox_plus_y_geq_3 = em->mkExpr(geq, twox_plus_y, three) let lhs = em->mkExpr(and_kind, x_positive, y_positive) (* This fails for some reason. *) -(* let rhs = new_BoolExpr(twox_plus_y_geq_3) - let formula = new_BoolExpr(lhs)->impExpr(rhs) *) +(* let rhs = new_Expr(twox_plus_y_geq_3) + let formula = new_Expr(lhs)->impExpr(rhs) *) let formula = em->mkExpr(implies, lhs, twox_plus_y_geq_3) -let bformula = new_BoolExpr(formula) in +let bformula = new_Expr(formula) in print_string "Checking validity of formula " ; print_string (get_string (formula->toString ())) ; diff --git a/examples/SimpleVC.php b/examples/SimpleVC.php index eb58860cc..329446703 100755 --- a/examples/SimpleVC.php +++ b/examples/SimpleVC.php @@ -48,7 +48,7 @@ my $twox_plus_y = $em->mkExpr($CVC4::PLUS, $twox, $y); my $three = $em->mkConst(new CVC4::Integer(3)); my $twox_plus_y_geq_3 = $em->mkExpr($CVC4::GEQ, $twox_plus_y, $three); -my $formula = new CVC4::BoolExpr($em->mkExpr($CVC4::AND, $x_positive, $y_positive))->impExpr(new CVC4::BoolExpr($twox_plus_y_geq_3)); +my $formula = new CVC4::Expr($em->mkExpr($CVC4::AND, $x_positive, $y_positive))->impExpr(new CVC4::Expr($twox_plus_y_geq_3)); print "Checking validity of formula " . $formula->toString() . " with CVC4.\n"; print "CVC4 should report VALID.\n"; diff --git a/examples/SimpleVC.pl b/examples/SimpleVC.pl index 6666d49e1..998c28bb0 100755 --- a/examples/SimpleVC.pl +++ b/examples/SimpleVC.pl @@ -48,7 +48,7 @@ my $twox_plus_y = $em->mkExpr($CVC4::PLUS, $twox, $y); my $three = $em->mkConst(new CVC4::Integer(3)); my $twox_plus_y_geq_3 = $em->mkExpr($CVC4::GEQ, $twox_plus_y, $three); -my $formula = new CVC4::BoolExpr($em->mkExpr($CVC4::AND, $x_positive, $y_positive))->impExpr(new CVC4::BoolExpr($twox_plus_y_geq_3)); +my $formula = new CVC4::Expr($em->mkExpr($CVC4::AND, $x_positive, $y_positive))->impExpr(new CVC4::Expr($twox_plus_y_geq_3)); print "Checking validity of formula " . $formula->toString() . " with CVC4.\n"; print "CVC4 should report VALID.\n"; diff --git a/examples/SimpleVC.py b/examples/SimpleVC.py index d2bd6d4c3..a1cd1a6bd 100755 --- a/examples/SimpleVC.py +++ b/examples/SimpleVC.py @@ -24,7 +24,7 @@ #### import CVC4 -from CVC4 import ExprManager, SmtEngine, Integer, BoolExpr +from CVC4 import ExprManager, SmtEngine, Integer, Expr import sys @@ -51,7 +51,7 @@ def main(): three = em.mkConst(Integer(3)) twox_plus_y_geq_3 = em.mkExpr(CVC4.GEQ, twox_plus_y, three) - formula = BoolExpr(em.mkExpr(CVC4.AND, x_positive, y_positive)).impExpr(BoolExpr(twox_plus_y_geq_3)) + formula = Expr(em.mkExpr(CVC4.AND, x_positive, y_positive)).impExpr(Expr(twox_plus_y_geq_3)) print "Checking validity of formula " + formula.toString() + " with CVC4." print "CVC4 should report VALID." diff --git a/examples/SimpleVC.rb b/examples/SimpleVC.rb index 36af3c215..0d19ef49f 100755 --- a/examples/SimpleVC.rb +++ b/examples/SimpleVC.rb @@ -47,7 +47,7 @@ twox_plus_y = em.mkExpr(PLUS, twox, y) three = em.mkConst(CVC4::Integer.new(3)) twox_plus_y_geq_3 = em.mkExpr(GEQ, twox_plus_y, three) -formula = BoolExpr.new(em.mkExpr(AND, x_positive, y_positive)).impExpr(BoolExpr.new(twox_plus_y_geq_3)) +formula = Expr.new(em.mkExpr(AND, x_positive, y_positive)).impExpr(Expr.new(twox_plus_y_geq_3)) puts "Checking validity of formula " + formula.toString + " with CVC4." puts "CVC4 should report VALID." diff --git a/examples/SimpleVC.tcl b/examples/SimpleVC.tcl index d2030f044..ed0decb26 100755 --- a/examples/SimpleVC.tcl +++ b/examples/SimpleVC.tcl @@ -46,7 +46,7 @@ set twox_plus_y [ExprManager_mkExpr em $PLUS $twox $y] set three [ExprManager_mkConst em [Integer _ 3]] set twox_plus_y_geq_3 [ExprManager_mkExpr em $GEQ $twox_plus_y $three] -set formula [BoolExpr_impExpr [BoolExpr _1 [ExprManager_mkExpr em $AND $x_positive $y_positive]] [BoolExpr _2 $twox_plus_y_geq_3]] +set formula [Expr_impExpr [Expr _1 [ExprManager_mkExpr em $AND $x_positive $y_positive]] [Expr _2 $twox_plus_y_geq_3]] puts "Checking validity of formula [Expr_toString $formula] with CVC4." puts "CVC4 should report VALID." |